Get MixedMode and Compiled IRBlockBody ready for call protocol instrs.

Only thing now left is to implement the JIT versions of the new block call protocol instructions and turn it on.
jruby · Dec 7, 2015 · baeb61d · baeb61d
1 parent 61127db
commit baeb61d
Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java b/core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java
@@ -31,6 +31,16 @@ public ArgumentDescriptor[] getArgumentDescriptors() {
         return closure.getArgumentDescriptors();
     }
 
+    @Override
+    protected IRubyObject callDirect(ThreadContext context, Block block, IRubyObject[] args, Block blockArg) {
+        throw new RuntimeException("callDirect not implemented in CompiledIRBlockBody. Implement me!");
+    }
+
+    @Override
+    protected IRubyObject yieldDirect(ThreadContext context, Block block, IRubyObject[] args, IRubyObject self) {
+        throw new RuntimeException("yieldDirect not implemented in CompiledIRBlockBody. Implement me!");
+    }
+
     protected IRubyObject commonYieldPath(ThreadContext context, Block block, IRubyObject[] args, IRubyObject self, Block blockArg) {
         Binding binding = block.getBinding();
         Visibility oldVis = binding.getFrame().getVisibility();

diff --git a/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java b/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java
@@ -4,6 +4,7 @@
 import org.jruby.RubyModule;
 import org.jruby.compiler.Compilable;
 import org.jruby.ir.IRClosure;
+import org.jruby.ir.IRFlags;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.interpreter.Interpreter;
 import org.jruby.ir.interpreter.InterpreterContext;
@@ -50,6 +51,7 @@ public void completeBuild(CompiledIRBlockBody blockBody) {
         this.callCount = -1;
         blockBody.evalType = this.evalType; // share with parent
         this.jittedBody = blockBody;
+        hasCallProtocolIR = closure.getFlags().contains(IRFlags.HAS_EXPLICIT_CALL_PROTOCOL);
     }
 
     @Override
@@ -75,6 +77,7 @@ public InterpreterContext ensureInstrsReady() {
 
         if (interpreterContext == null) {
             interpreterContext = closure.getInterpreterContext();
+            hasCallProtocolIR = closure.getFlags().contains(IRFlags.HAS_EXPLICIT_CALL_PROTOCOL);
         }
         return interpreterContext;
     }