jruby · Oct 5, 2015 · Oct 5, 2015 · Oct 5, 2015
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java
@@ -239,7 +239,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule klaz
      * @return true if the call would not violate visibility; false otherwise
      */
     public boolean isCallableFrom(IRubyObject caller, CallType callType) {
-        switch (Visibility.values()[visibility]) {
+        switch (Visibility.getValues()[visibility]) {
         case PUBLIC:
             return true;
         case PRIVATE:
@@ -322,7 +322,7 @@ public void setImplementationClass(RubyModule implClass) {
      * @return The visibility of this method
      */
     public Visibility getVisibility() {
-        return Visibility.values()[visibility];
+        return Visibility.getValues()[visibility];
     }
 
     /**

diff --git a/core/src/main/java/org/jruby/ir/instructions/ArgScopeDepthInstr.java b/core/src/main/java/org/jruby/ir/instructions/ArgScopeDepthInstr.java
@@ -2,9 +2,9 @@
 
 import org.jruby.ir.IRVisitor;
 import org.jruby.ir.Operation;
-import org.jruby.ir.operands.Operand;
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.persistence.IRReaderDecoder;
+import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
@@ -28,12 +28,7 @@ public void visit(IRVisitor visitor) {
 
     @Override
     public Object interpret(ThreadContext context, StaticScope currScope, DynamicScope currDynScope, IRubyObject self, Object[] temp) {
-        int i = 0;
-        while (!currDynScope.getStaticScope().isArgumentScope()) {
-            currDynScope = currDynScope.getParentScope();
-            i++;
-        }
-        return context.runtime.newFixnum(i);
+        return IRRuntimeHelpers.getArgScopeDepth(context, currScope);
     }
 
     public static ArgScopeDepthInstr decode(IRReaderDecoder d) {

diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1442,4 +1442,14 @@ public static IRubyObject getVariableWithAccessor(IRubyObject self, VariableAcce
     public static void setVariableWithAccessor(IRubyObject self, IRubyObject value, VariableAccessor accessor) {
         accessor.set(self, value);
     }
+
+    @JIT
+    public static RubyFixnum getArgScopeDepth(ThreadContext context, StaticScope currScope) {
+        int i = 0;
+        while (!currScope.isArgumentScope()) {
+            currScope = currScope.getEnclosingScope();
+            i++;
+        }
+        return context.runtime.newFixnum(i);
+    }
 }
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -415,6 +415,14 @@ public void AliasInstr(AliasInstr aliasInstr) {
         m.invokeIRHelper("defineAlias", sig(void.class, ThreadContext.class, IRubyObject.class, DynamicScope.class, String.class, String.class));
     }
 
+    @Override
+    public void ArgScopeDepthInstr(ArgScopeDepthInstr instr) {
+        jvmMethod().loadContext();
+        jvmMethod().loadStaticScope();
+        jvmMethod().invokeIRHelper("getArgScopeDepth", sig(RubyFixnum.class, ThreadContext.class, StaticScope.class));
+        jvmStoreLocal(instr.getResult());
+    }
+
     @Override
     public void AttrAssignInstr(AttrAssignInstr attrAssignInstr) {
         Operand[] callArgs = attrAssignInstr.getCallArgs();
@@ -1425,9 +1433,7 @@ public void PushFrameInstr(PushFrameInstr pushframeinstr) {
         // FIXME: this should be part of explicit call protocol only when needed, optimizable, and correct for the scope
         // See also CompiledIRMethod.call
         jvmMethod().loadContext();
-        jvmAdapter().invokestatic(p(Visibility.class), "values", sig(Visibility[].class));
-        jvmAdapter().ldc(Visibility.PUBLIC.ordinal());
-        jvmAdapter().aaload();
+        jvmAdapter().getstatic(p(Visibility.class), "PUBLIC", ci(Visibility.class));
         jvmAdapter().invokevirtual(p(ThreadContext.class), "setCurrentVisibility", sig(void.class, Visibility.class));
     }
 

diff --git a/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java b/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java
@@ -49,6 +49,7 @@ public void setCallCount(int callCount) {
     @Override
     public void completeBuild(CompiledIRBlockBody blockBody) {
         this.callCount = -1;
+        blockBody.evalType = this.evalType; // share with parent
         this.jittedBody = blockBody;
     }
 

diff --git a/core/src/main/java/org/jruby/runtime/Visibility.java b/core/src/main/java/org/jruby/runtime/Visibility.java
@@ -27,6 +27,8 @@
 
 public enum Visibility {
     PUBLIC, PROTECTED, PRIVATE, MODULE_FUNCTION;
+
+    private static final Visibility[] VALUES = values();
 
     public boolean isPrivate() {
         return this == PRIVATE;
@@ -35,4 +37,8 @@ public boolean isPrivate() {
     public boolean isProtected() {
         return this == PROTECTED;
     }
+
+    public static Visibility[] getValues() {
+        return VALUES;
+    }
 }