jruby · Sep 20, 2014 · Sep 20, 2014
Showing with 70 additions and 20 deletions.

+6 −0 core/src/main/java/org/jruby/ir/instructions/BacktickInstr.java

+38 −2 core/src/main/java/org/jruby/ir/targets/JVMVisitor.java

+26 −0 spec/compiler/general_spec.rb

+0 −18 test/jruby/test_ast_inspector.rb
diff --git a/core/src/main/java/org/jruby/ir/instructions/BacktickInstr.java b/core/src/main/java/org/jruby/ir/instructions/BacktickInstr.java
@@ -43,6 +43,10 @@ public Variable getResult() {
         return result;
     }
 
+    public List<Operand> getPieces() {
+        return pieces;
+    }
+
     @Override
     public void updateResult(Variable v) {
         this.result = v;
@@ -82,6 +86,8 @@ public Object interpret(ThreadContext context, StaticScope currScope, DynamicSco
             newString.append((piece instanceof RubyString) ? (RubyString) piece : piece.to_s());
         }
 
+        newString.setFrozen(true);
+
         return self.callMethod(context, "`", newString);
     }
 

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -14,6 +14,7 @@
 import org.jruby.ir.operands.Boolean;
 import org.jruby.ir.operands.Float;
 import org.jruby.ir.operands.GlobalVariable;
+import org.jruby.ir.operands.Label;
 import org.jruby.ir.representations.BasicBlock;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.parser.StaticScope;
@@ -598,7 +599,35 @@ public void AluInstr(AluInstr instr) {
 
     @Override
     public void BacktickInstr(BacktickInstr instr) {
-        super.BacktickInstr(instr);    //To change body of overridden methods use File | Settings | File Templates.
+        // prepare for call to "`" below
+        jvmMethod().loadContext();
+        jvmMethod().loadSelf(); // TODO: remove caller
+        jvmMethod().loadSelf();
+
+        ByteList csByteList = new ByteList();
+        jvmMethod().pushString(csByteList);
+
+        for (Operand p : instr.getPieces()) {
+            // visit piece and ensure it's a string
+            visit(p);
+            jvmAdapter().dup();
+            org.objectweb.asm.Label after = new org.objectweb.asm.Label();
+            jvmAdapter().instance_of(p(RubyString.class));
+            jvmAdapter().iftrue(after);
+            jvmAdapter().invokevirtual(p(IRubyObject.class), "anyToString", sig(IRubyObject.class));
+
+            jvmAdapter().label(after);
+            jvmAdapter().invokevirtual(p(RubyString.class), "append", sig(RubyString.class, IRubyObject.class));
+        }
+
+        // freeze the string
+        jvmAdapter().dup();
+        jvmAdapter().ldc(true);
+        jvmAdapter().invokeinterface(p(IRubyObject.class), "setFrozen", sig(void.class, boolean.class));
+
+        // invoke the "`" method on self
+        jvmMethod().invokeSelf("`", 1, false);
+        jvmStoreLocal(instr.getResult());
     }
 
     @Override
@@ -2062,7 +2091,14 @@ public void StringLiteral(StringLiteral stringliteral) {
 
     @Override
     public void SValue(SValue svalue) {
-        super.SValue(svalue);    //To change body of overridden methods use File | Settings | File Templates.
+        visit(svalue.getArray());
+        jvmAdapter().dup();
+        jvmAdapter().instance_of(p(RubyArray.class));
+        org.objectweb.asm.Label after = new org.objectweb.asm.Label();
+        jvmAdapter().iftrue(after);
+        jvmAdapter().pop();
+        jvmMethod().pushNil();
+        jvmAdapter().label(after);
     }
 
     @Override

diff --git a/spec/compiler/general_spec.rb b/spec/compiler/general_spec.rb
@@ -827,4 +827,30 @@ class JRUBY4925
     x = compile_and_run '::JRUBY4925_BLAH, a = 1, 2'
     expect(JRUBY4925_BLAH).to eq 1
   end
+
+  it "compiles backquotes (backtick)" do
+    x = compile_and_run 'o = Object.new; def o.`(str); str; end; def o.go; `hello`; end; o.go'
+
+    expect(x).to eq 'hello'
+  end
+
+  it "creates frozen strings for backquotes (backtick)" do
+    x = compile_and_run 'o = Object.new; def o.`(str); str; end; def o.go; `hello`; end; o.go'
+
+    expect(x).to be_frozen
+  end
+
+  it "compiles rest args passed to return, break, and next (svalue)" do
+    x = compile_and_run 'a = [1,2,3]; 1.times { break *a }'
+
+    expect(x).to eq [1,2,3]
+
+    x = compile_and_run 'a = [1,2,3]; lambda { return *a }.call'
+
+    expect(x).to eq [1,2,3]
+
+    x = compile_and_run 'a = [1,2,3]; def foo; yield; end; foo { next *a }'
+
+    expect(x).to eq [1,2,3]
+  end
 end
diff --git a/test/jruby/test_ast_inspector.rb b/test/jruby/test_ast_inspector.rb