Make prepareFullBuildCommon private since it is not intended to be us…

…ed by anything outside IRScope. Make small name change to try and make prepareXXX methods more clear on intent
jruby · Jan 7, 2016 · 9ae041a · 9ae041a
1 parent f302e3d
commit 9ae041a
Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRMethod.java b/core/src/main/java/org/jruby/ir/IRMethod.java
@@ -42,10 +42,10 @@ public synchronized InterpreterContext lazilyAcquireInterpreterContext() {
         return interpreterContext;
     }
 
-    public synchronized BasicBlock[] prepareForInitialCompilation() {
+    public synchronized BasicBlock[] prepareForCompilation() {
         if (!hasBeenBuilt()) lazilyAcquireInterpreterContext();
 
-        return super.prepareForInitialCompilation();
+        return super.prepareForCompilation();
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -530,7 +530,7 @@ private Instr[] cloneInstrs() {
         return newInstructions;
     }
 
-    public void prepareFullBuildCommon() {
+    private void prepareFullBuildCommon() {
         // We already made it.
         if (fullInterpreterContext != null) return;
 
@@ -566,8 +566,8 @@ public synchronized FullInterpreterContext prepareFullBuild() {
         return fullInterpreterContext;
     }
 
-    /** Run any necessary passes to get the IR ready for compilation */
-    public synchronized BasicBlock[] prepareForInitialCompilation() {
+    /** Run any necessary passes to get the IR ready for compilation (AOT and/or JIT) */
+    public synchronized BasicBlock[] prepareForCompilation() {
         // Don't run if same method was queued up in the tiny race for scheduling JIT/Full Build OR
         // for any nested closures which got a a fullInterpreterContext but have not run any passes
         // or generated instructions.

diff --git a/core/src/main/java/org/jruby/ir/interpreter/FullInterpreterContext.java b/core/src/main/java/org/jruby/ir/interpreter/FullInterpreterContext.java
@@ -21,7 +21,7 @@
 public class FullInterpreterContext extends InterpreterContext {
     private CFG cfg;
 
-    // Creation of this field will happen in generateInstructionsForInterpretation or during IRScope.prepareForInitialCompilation.
+    // Creation of this field will happen in generateInstructionsForInterpretation or during IRScope.prepareForCompilation.
     // FIXME: At some point when we relinearize after running another phase of passes we should document that here to know how this field is changed
     private BasicBlock[] linearizedBBList = null;
 

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -136,7 +136,7 @@ private void logScope(IRScope scope) {
     }
 
     public void emitScope(IRScope scope, String name, Signature signature, boolean specificArity) {
-        BasicBlock[] bbs = scope.prepareForInitialCompilation();
+        BasicBlock[] bbs = scope.prepareForCompilation();
 
         Map <BasicBlock, Label> exceptionTable = scope.buildJVMExceptionTable();