Merge pull request #4392 from jruby/compile_more

compile back to hard scope when closure compile/build requested
jruby · Jan 11, 2017 · bcd2bab · bcd2bab
2 parents bbd0440 + 31f0082
commit bcd2bab
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/compiler/FullBuildTask.java b/core/src/main/java/org/jruby/compiler/FullBuildTask.java
@@ -16,6 +16,8 @@ class FullBuildTask implements Runnable {
 
     public void run() {
         try {
+            method.getIRScope().getTopLevelScope().prepareFullBuild();
+
             method.completeBuild(method.getIRScope().prepareFullBuild());
 
             if (jitCompiler.config.isJitLogging()) {

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -562,6 +562,10 @@ public synchronized FullInterpreterContext prepareFullBuild() {
         // or generated instructions.
         if (fullInterpreterContext != null && fullInterpreterContext.buildComplete()) return fullInterpreterContext;
 
+        for (IRScope scope: getClosures()) {
+            scope.prepareFullBuild();
+        }
+
         prepareFullBuildCommon();
         runCompilerPasses(getManager().getCompilerPasses(this));
         getManager().optimizeIfSimpleScope(this);
@@ -581,6 +585,10 @@ public synchronized BasicBlock[] prepareForCompilation() {
         // or generated instructions.
         if (fullInterpreterContext != null && fullInterpreterContext.buildComplete()) return fullInterpreterContext.getLinearizedBBList();
 
+        for (IRScope scope: getClosures()) {
+            scope.prepareForCompilation();
+        }
+
         prepareFullBuildCommon();
 
         runCompilerPasses(getManager().getJITPasses(this));

diff --git a/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java b/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java
@@ -166,7 +166,7 @@ protected void promoteToFullBuild(ThreadContext context) {
         if (callCount >= 0) {
             // ensure we've got code ready for JIT
             ensureInstrsReady();
-            closure.prepareForCompilation();
+            closure.getNearestTopLocalVariableScope().prepareForCompilation();
 
             // if we don't have an explicit protocol, disable JIT
             if (!closure.hasExplicitCallProtocol()) {