Fix pushsymbolproc to use id vs bytelist to be consistent with new id

strategy.
jruby · Apr 24, 2018 · 6f74142 · 6f74142
1 parent 135da97
commit 6f74142
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1928,12 +1928,12 @@ public static IRubyObject useBindingSelf(Binding binding) {
      * Create a new Symbol.to_proc for the given symbol name and encoding.
      *
      * @param context
-     * @param symbol
+     * @param id
      * @return
      */
     @JIT
-    public static RubyProc newSymbolProc(ThreadContext context, ByteList symbol) {
-        return (RubyProc) context.runtime.newSymbol(symbol).to_proc(context);
+    public static RubyProc newSymbolProc(ThreadContext context, String id) {
+        return (RubyProc) context.runtime.newSymbol(id).to_proc(context);
     }
 
     /**

diff --git a/core/src/main/java/org/jruby/ir/targets/IRBytecodeAdapter.java b/core/src/main/java/org/jruby/ir/targets/IRBytecodeAdapter.java
@@ -335,9 +335,9 @@ public org.objectweb.asm.Label newLabel() {
      *
      * Stack required: none
      *
-     * @param bytes the ByteList for the symbol.
+     * @param id raw id string for the symbol.
      */
-    public abstract void pushSymbolProc(ByteList bytes);
+    public abstract void pushSymbolProc(String id);
 
         /**
          * Push the JRuby runtime on the stack.

diff --git a/core/src/main/java/org/jruby/ir/targets/IRBytecodeAdapter6.java b/core/src/main/java/org/jruby/ir/targets/IRBytecodeAdapter6.java
@@ -354,13 +354,13 @@ public void run() {
         });
     }
 
-    public void pushSymbolProc(final ByteList bytes) {
+    public void pushSymbolProc(final String id) {
         cacheValuePermanentlyLoadContext("symbolProc", RubyProc.class, null, new Runnable() {
             @Override
             public void run() {
                 loadContext();
-                pushByteList(bytes);
-                invokeIRHelper("newSymbolProc", sig(RubyProc.class, ThreadContext.class, ByteList.class));
+                adapter.ldc(id);
+                invokeIRHelper("newSymbolProc", sig(RubyProc.class, ThreadContext.class, String.class));
             }
         });
     }

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -2608,8 +2608,7 @@ public void Symbol(Symbol symbol) {
 
     @Override
     public void SymbolProc(SymbolProc symbolproc) {
-        // FIXME: bytelist_love - we can also do getId() is we will just cache lookup for symbol?
-        jvmMethod().pushSymbolProc(symbolproc.getName().getBytes());
+        jvmMethod().pushSymbolProc(symbolproc.getId());
     }
 
     @Override