Remove thread-local block type that no longer seems to be needed.

jruby · Jul 10, 2018 · fbd727f · fbd727f
1 parent 02e852a
commit fbd727f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 18 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1747,7 +1747,7 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
             args = IRubyObject.NULL_ARRAY;
         }
 
-        boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
+        boolean isProcCall = block.type == Block.Type.PROC;
         org.jruby.runtime.Signature sig = block.getBody().getSignature();
         if (block.type == Block.Type.LAMBDA) {
             if (!isProcCall && sig.arityValue() != -1 && sig.required() != 1) {
@@ -1832,7 +1832,7 @@ public static IRubyObject[] prepareSingleBlockArgs(ThreadContext context, Block
             return args;
         }
 
-        boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
+        boolean isProcCall = block.type == Block.Type.PROC;
         if (isProcCall) {
             if (args.length == 0) {
                 args = context.runtime.getSingleNilArray();
@@ -1853,7 +1853,7 @@ public static IRubyObject[] prepareFixedBlockArgs(ThreadContext context, Block b
             args = IRubyObject.NULL_ARRAY;
         }
 
-        boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
+        boolean isProcCall = block.type == Block.Type.PROC;
         if (block.type == Block.Type.LAMBDA) {
             org.jruby.runtime.Signature sig = block.getBody().getSignature();
             // We don't need to check for the 1 required arg case here

diff --git a/core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java b/core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java
@@ -146,7 +146,6 @@ public MethodHandle getHandle() {
 
     @Override
     protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject[] args, Block blockArg) {
-        context.setCurrentBlockType(block.type);
         try {
             return (IRubyObject)handle.invokeExact(context, block, getStaticScope(), (IRubyObject)null, args, blockArg, block.getBinding().getMethod(), block.type);
         } catch (Throwable t) {
@@ -157,8 +156,6 @@ protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject
 
     @Override
     protected IRubyObject yieldDirect(ThreadContext context, Block block, IRubyObject[] args, IRubyObject self) {
-        context.setCurrentBlockType(block.type);
-//        if (block.type != Block.Type.NORMAL) System.out.println("MISMATCH: " + getScope());
         try {
             return (IRubyObject)handle.invokeExact(context, block, getStaticScope(), self, args, Block.NULL_BLOCK, block.getBinding().getMethod(), block.type);
         } catch (Throwable t) {

diff --git a/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java b/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java
@@ -95,14 +95,12 @@ public boolean canCallDirect() {
 
     @Override
     protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject[] args, Block blockArg) {
-        context.setCurrentBlockType(block.type);
         InterpreterContext ic = ensureInstrsReady(); // so we get debugging output
         return Interpreter.INTERPRET_BLOCK(context, block, null, ic, args, block.getBinding().getMethod(), blockArg);
     }
 
     @Override
     protected IRubyObject yieldDirect(ThreadContext context, Block block, IRubyObject[] args, IRubyObject self) {
-        context.setCurrentBlockType(block.type);
         InterpreterContext ic = ensureInstrsReady(); // so we get debugging output
         return Interpreter.INTERPRET_BLOCK(context, block, self, ic, args, block.getBinding().getMethod(), Block.NULL_BLOCK);
     }

diff --git a/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java b/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java
@@ -113,7 +113,6 @@ protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject
         // We should never get here if jittedBody is null
         assert jittedBody != null : "direct call in MixedModeIRBlockBody without jitted body";
 
-        context.setCurrentBlockType(block.type);
         return jittedBody.callDirect(context, block, args, blockArg);
     }
 
@@ -122,7 +121,6 @@ protected IRubyObject yieldDirect(ThreadContext context, Block block, IRubyObjec
         // We should never get here if jittedBody is null
         assert jittedBody != null : "direct yield in MixedModeIRBlockBody without jitted body";
 
-        context.setCurrentBlockType(block.type);
         return jittedBody.yieldDirect(context, block, args, self);
     }
 

diff --git a/core/src/main/java/org/jruby/runtime/ThreadContext.java b/core/src/main/java/org/jruby/runtime/ThreadContext.java
@@ -257,14 +257,6 @@ public IRubyObject setErrorInfo(IRubyObject errorInfo) {
         return errorInfo;
     }
 
-    public Block.Type getCurrentBlockType() {
-        return currentBlockType;
-    }
-
-    public void setCurrentBlockType(Block.Type type) {
-        currentBlockType = type;
-    }
-
     public Throwable getSavedExceptionInLambda() {
         return savedExcInLambda;
     }