jruby · Sep 18, 2014 · Sep 18, 2014
Showing with 15 additions and 13 deletions.

+2 −2 core/src/main/java/org/jruby/ir/IRManager.java

+7 −4 core/src/main/java/org/jruby/ir/IRScope.java

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

+1 −5 spec/compiler/general_spec.rb
diff --git a/core/src/main/java/org/jruby/ir/IRManager.java b/core/src/main/java/org/jruby/ir/IRManager.java
@@ -18,8 +18,8 @@
  */
 public class IRManager {
     public static String SAFE_COMPILER_PASSES = "LinearizeCFG";
-    public static String DEFAULT_COMPILER_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass,AddLocalVarLoadStoreInstructions,EnsureTempsAssigned,LinearizeCFG";
-    public static String DEFAULT_JIT_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass,AddLocalVarLoadStoreInstructions,EnsureTempsAssigned,AddCallProtocolInstructions,LinearizeCFG";
+    public static String DEFAULT_COMPILER_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass,LinearizeCFG";
+    public static String DEFAULT_JIT_PASSES = "AddLocalVarLoadStoreInstructions,AddCallProtocolInstructions,EnsureTempsAssigned,OptimizeTempVarsPass,LocalOptimizationPass,LinearizeCFG";
     public static String DEFAULT_INLINING_COMPILER_PASSES = "LocalOptimizationPass";
 
     private int dummyMetaClassCount = 0;

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -617,11 +617,14 @@ public synchronized Instr[] prepareForInterpretation(boolean isLambda) {
     /* SSS FIXME: Do we need to synchronize on this?  Cache this info in a scope field? */
     /** Run any necessary passes to get the IR ready for compilation */
     public synchronized List<BasicBlock> prepareForCompilation() {
+        // Reset linearization, since we will add JIT-specific flow and instrs
+        resetLinearizationData();
+
         // Build CFG and run compiler passes, if necessary
-        boolean runPasses = false;
+//        boolean runPasses = false;
         if (getCFG() == null) {
             buildCFG();
-            runPasses = true;
+//            runPasses = true;
         }
 
         // Add this always since we dont re-JIT a previously
@@ -635,7 +638,7 @@ public synchronized List<BasicBlock> prepareForCompilation() {
             ((IRClosure)this).addGEBForUncaughtBreaks();
         }
 
-        if (runPasses) {
+//        if (runPasses) {
             runCompilerPasses(getManager().getJITPasses(this));
 
             if (RubyInstanceConfig.IR_COMPILER_PASSES == null) {
@@ -646,7 +649,7 @@ public synchronized List<BasicBlock> prepareForCompilation() {
                 // no DCE for now to stress-test JIT
                 //runDeadCodeAndVarLoadStorePasses();
             }
-        }
+//        }
 
         checkRelinearization();
 

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -367,8 +367,11 @@ public void AliasInstr(AliasInstr aliasInstr) {
         m.loadContext();
         m.loadSelf();
         jvmLoadLocal(DYNAMIC_SCOPE);
-        m.adapter.ldc(((StringLiteral)aliasInstr.getNewName()).string);
-        m.adapter.ldc(((StringLiteral)aliasInstr.getOldName()).string);
+        // CON FIXME: Ideally this would not have to pass through RubyString and toString
+        visit(aliasInstr.getNewName());
+        jvmAdapter().invokevirtual(p(Object.class), "toString", sig(String.class));
+        visit(aliasInstr.getOldName());
+        jvmAdapter().invokevirtual(p(Object.class), "toString", sig(String.class));
         m.invokeIRHelper("defineAlias", sig(void.class, ThreadContext.class, IRubyObject.class, DynamicScope.class, String.class, String.class));
     }
 

diff --git a/spec/compiler/general_spec.rb b/spec/compiler/general_spec.rb
@@ -8,7 +8,6 @@ def compile_to_method(src, filename = nil)
     node = JRuby.parse(src, filename || "testCompiler#{next_src_id}", false)
     filename = node.position.file
     oj = org.jruby
-    classname = oj.util.JavaNameMangler.mangleFilenameForClasspath(filename)
 
     # This logic is a mix of logic from InterpretedIRMethod's JIT, o.j.Ruby's script compilation, and IRScriptBody's
     # interpret. We need to figure out a cleaner path.
@@ -23,7 +22,7 @@ def compile_to_method(src, filename = nil)
       scope.setModule(currModule)
     end
 
-    compiled = oj.ir.targets.JVMVisitor.compile(method, oj.util.ClassCache::OneShotClassLoader.new(JRuby.runtime.getJRubyClassLoader()))
+    compiled = oj.ir.targets.JVMVisitor.compile(method, oj.util.OneShotClassLoader.new(JRuby.runtime.getJRubyClassLoader()))
     scriptMethod = compiled.getMethod(
         "__script__",
         oj.runtime.ThreadContext.java_class,
@@ -75,9 +74,6 @@ def compile_and_run(src, filename = nil)
 describe "JRuby's bytecode compiler" do
   include CompilerTestUtils
 
-  StandardASMCompiler = org.jruby.compiler.impl.StandardASMCompiler
-  ASTCompiler = org.jruby.compiler.ASTCompiler
-  ASTInspector = org.jruby.compiler.ASTInspector
   Block = org.jruby.runtime.Block
   IRubyObject = org.jruby.runtime.builtin.IRubyObject