Fix JIT'ing make things explode (comment in commit explains in better…

… detail)
jruby · Feb 20, 2015 · 3158e91 · 3158e91
1 parent 35ea009
commit 3158e91
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -698,6 +698,15 @@ public synchronized InterpreterContext prepareForInterpretation(boolean rebuild)
 
     /** Run any necessary passes to get the IR ready for compilation */
     public synchronized List<BasicBlock> prepareForCompilation() {
+        // FIXME: This is messy and prepareForInterpretation and prepareForCompilation need to
+        // clean up the lifecycle aspects of creating CFG from instrList and running passes in
+        // a consistent and predictable way.  This is a hack atm to unbreak the fact JIT
+        // may happen before IC.build count and thus not have cloned the instrs (which then
+        // modifies instrs IC is using causing weird blowups.
+        if (getCFG() == null) {
+            cloneInstrs();
+        }
+
         // Reset linearization, if any exists
         resetLinearizationData();