Change Truffle::Graal.bailout into a TrufflePrimitive.compiler_bailout

Author: pitr-ch

spec/truffle/graal/bailout_spec.rb

@@ -8,15 +8,11 @@
 
 require_relative '../../ruby/spec_helper'
 
-describe "Truffle::Graal.bailout" do
-
-  it "raises a RuntimeError when called dynamically" do
-    -> { Truffle::Graal.send(:bailout, "message") }.should raise_error(RuntimeError)
-  end
+describe "TrufflePrimitive.compiler_bailout" do
 
   guard -> { !TruffleRuby.jit? } do
     it "returns nil" do
-      Truffle::Graal.bailout("message").should be_nil
+      TrufflePrimitive.compiler_bailout("message").should be_nil
     end
   end
 

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -243,10 +243,6 @@ public DynamicObject frozenError(String message, Node currentNode) {
 
     // RuntimeError
 
-    public DynamicObject runtimeErrorBailout(Node currentNode) {
-        return runtimeError("Truffle::Graal.bailout can only be called lexically", currentNode);
-    }
-
     public DynamicObject runtimeErrorCoverageNotEnabled(Node currentNode) {
         return runtimeError("coverage measurement is not enabled", currentNode);
     }

src/main/java/org/truffleruby/extra/TruffleGraalNodes.java

@@ -10,6 +10,7 @@
 package org.truffleruby.extra;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import org.truffleruby.Layouts;
 import org.truffleruby.builtins.CoreModule;
@@ -18,6 +19,7 @@
 import org.truffleruby.builtins.Primitive;
 import org.truffleruby.builtins.PrimitiveNode;
 import org.truffleruby.core.proc.ProcType;
+import org.truffleruby.interop.ToJavaStringNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -38,17 +40,6 @@
 @CoreModule("Truffle::Graal")
 public abstract class TruffleGraalNodes {
 
-    @CoreMethod(names = "bailout", onSingleton = true, required = 1)
-    public abstract static class BailoutNode extends CoreMethodArrayArgumentsNode {
-
-        @TruffleBoundary
-        @Specialization(guards = "isRubyString(message)")
-        protected DynamicObject bailout(DynamicObject message) {
-            throw new RaiseException(getContext(), coreExceptions().runtimeErrorBailout(this));
-        }
-
-    }
-
     @CoreMethod(names = "always_split", onSingleton = true, required = 1, argumentNames = "method_or_proc")
     public abstract static class AlwaysSplitNode extends CoreMethodArrayArgumentsNode {
 
@@ -189,5 +180,17 @@ private void compiledBoundary() {
         }
     }
 
+    @Primitive(name = "compiler_bailout")
+    @NodeChild(value = "value", type = RubyNode.class)
+    public abstract static class BailoutNode extends PrimitiveNode {
+
+        @Specialization(guards = "isRubyString(message)")
+        protected DynamicObject bailout(DynamicObject message,
+                @Cached ToJavaStringNode toJavaStringNode) {
+            CompilerDirectives.bailout(toJavaStringNode.executeToJavaString(message));
+            return nil();
+        }
+    }
+
 
 }

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -252,7 +252,6 @@
 import org.truffleruby.parser.parser.ParseNodeTuple;
 import org.truffleruby.parser.parser.ParserSupport;
 import org.truffleruby.parser.scope.StaticScope;
-import org.truffleruby.platform.BailoutNode;
 
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
@@ -513,16 +512,7 @@ public RubyNode visitCallNode(CallParseNode node) {
             return addNewlineIfNeeded(node, ret);
         }
 
-        if (receiver instanceof Colon2ConstParseNode // Truffle::Graal.<method>
-                && ((Colon2ConstParseNode) receiver).getLeftNode() instanceof ConstParseNode &&
-                ((ConstParseNode) ((Colon2ConstParseNode) receiver).getLeftNode()).getName().equals("Truffle") &&
-                ((Colon2ConstParseNode) receiver).getName().equals("Graal")) {
-            if (methodName.equals("bailout")) {
-                final RubyNode ret = BailoutNode.create(((ArrayParseNode) node.getArgsNode()).get(0).accept(this));
-                ret.unsafeSetSourceSection(sourceSection);
-                return addNewlineIfNeeded(node, ret);
-            }
-        } else if (receiver instanceof VCallParseNode // undefined.equal?(obj)
+        if (receiver instanceof VCallParseNode // undefined.equal?(obj)
                 && ((VCallParseNode) receiver).getName().equals("undefined") && inCore() &&
                 methodName.equals("equal?")) {
             RubyNode argument = translateArgumentsAndBlock(sourceSection, null, node.getArgsNode(), methodName)