Use currScope instead of retrieving from DynamicScope.

jruby · Mar 2, 2018 · d8823f9 · d8823f9
1 parent f2d91a1
commit d8823f9
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ir/instructions/RuntimeHelperCall.java b/core/src/main/java/org/jruby/ir/instructions/RuntimeHelperCall.java
@@ -89,8 +89,6 @@ public String[] toStringNonOperandArgs() {
     }
 
     public IRubyObject callHelper(ThreadContext context, StaticScope currScope, DynamicScope currDynScope, IRubyObject self, Object[] temp, Block.Type blockType) {
-        StaticScope scope = currDynScope.getStaticScope();
-
         if (helperMethod == Methods.IS_DEFINED_BACKREF) {
             return IRRuntimeHelpers.isDefinedBackref(
                     context,
@@ -117,9 +115,9 @@ public IRubyObject callHelper(ThreadContext context, StaticScope currScope, Dyna
             case HANDLE_PROPAGATED_BREAK:
                 return IRRuntimeHelpers.handlePropagatedBreak(context, currDynScope, arg1, blockType);
             case HANDLE_NONLOCAL_RETURN:
-                return IRRuntimeHelpers.handleNonlocalReturn(currDynScope.getStaticScope(), currDynScope, arg1, blockType);
+                return IRRuntimeHelpers.handleNonlocalReturn(currScope, currDynScope, arg1, blockType);
             case HANDLE_BREAK_AND_RETURNS_IN_LAMBDA:
-                return IRRuntimeHelpers.handleBreakAndReturnsInLambdas(context, currDynScope.getStaticScope(), currDynScope, arg1, blockType);
+                return IRRuntimeHelpers.handleBreakAndReturnsInLambdas(context, currScope, currDynScope, arg1, blockType);
             case IS_DEFINED_CALL:
                 return IRRuntimeHelpers.isDefinedCall(
                         context,