Init hasCallProtocolIR to false always

* Trying to looking it up in closure is prone to bugs in case the closure is being promoted to full build concurrently. * This fixes the non-deterministic test failures in test:mri
jruby · Dec 12, 2015 · 583ab75 · 583ab75
1 parent 8563414
commit 583ab75
Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java b/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java
@@ -64,7 +64,7 @@ public InterpreterContext ensureInstrsReady() {
 
         if (interpreterContext == null) {
             interpreterContext = closure.getInterpreterContext();
-            hasCallProtocolIR = closure.getFlags().contains(IRFlags.HAS_EXPLICIT_CALL_PROTOCOL);
+            hasCallProtocolIR = false;
         }
         return interpreterContext;
     }

diff --git a/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java b/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java
@@ -77,7 +77,7 @@ public InterpreterContext ensureInstrsReady() {
 
         if (interpreterContext == null) {
             interpreterContext = closure.getInterpreterContext();
-            hasCallProtocolIR = closure.getFlags().contains(IRFlags.HAS_EXPLICIT_CALL_PROTOCOL);
+            hasCallProtocolIR = false;
         }
         return interpreterContext;
     }