Try always setting current block type to current block's type.

headius · headius · commit 02e852ae74d1 · 2018-07-09T11:52:12.000-05:00
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,7 @@ public MethodHandle getHandle() {
 
     @Override
     protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject[] args, Block blockArg) {
-        context.setCurrentBlockType(Block.Type.PROC);
+        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,7 +157,8 @@ protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject
 
     @Override
     protected IRubyObject yieldDirect(ThreadContext context, Block block, IRubyObject[] args, IRubyObject self) {
-        context.setCurrentBlockType(Block.Type.NORMAL);
+        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,14 @@ public boolean canCallDirect() {
 
     @Override
     protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject[] args, Block blockArg) {
-        context.setCurrentBlockType(Block.Type.PROC);
+        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.NORMAL);
+        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,7 @@ 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.PROC);
+        context.setCurrentBlockType(block.type);
         return jittedBody.callDirect(context, block, args, blockArg);
     }
 
@@ -122,7 +122,7 @@ 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.NORMAL);
+        context.setCurrentBlockType(block.type);
         return jittedBody.yieldDirect(context, block, args, self);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject`
`113`	`113`	`// We should never get here if jittedBody is null`
`114`	`114`	`assert jittedBody != null : "direct call in MixedModeIRBlockBody without jitted body";`
`115`	`115`
`116`		`- context.setCurrentBlockType(Block.Type.PROC);`
	`116`	`+ context.setCurrentBlockType(block.type);`
`117`	`117`	`return jittedBody.callDirect(context, block, args, blockArg);`
`118`	`118`	`}`
`119`	`119`
`@@ -122,7 +122,7 @@ protected IRubyObject yieldDirect(ThreadContext context, Block block, IRubyObjec`
`122`	`122`	`// We should never get here if jittedBody is null`
`123`	`123`	`assert jittedBody != null : "direct yield in MixedModeIRBlockBody without jitted body";`
`124`	`124`
`125`		`- context.setCurrentBlockType(Block.Type.NORMAL);`
	`125`	`+ context.setCurrentBlockType(block.type);`
`126`	`126`	`return jittedBody.yieldDirect(context, block, args, self);`
`127`	`127`	`}`
`128`	`128`