jruby · Apr 25, 2015 · Apr 25, 2015 · Apr 25, 2015 · Apr 25, 2015
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -300,7 +300,7 @@ def bench(command, *args)
     bench_args = ["-I#{bench_dir}/lib", "#{bench_dir}/bin/bench"]
     case command
     when 'debug'
-      env_vars = env_vars.merge({'JRUBY_OPTS' => '-J-G:+TraceTruffleCompilation -J-G:+DumpOnError -J-G:+TruffleCompilationExceptionsAreThrown'})
+      env_vars = env_vars.merge({'JRUBY_OPTS' => '-J-G:+TraceTruffleCompilation -J-G:+DumpOnError -J-G:+TruffleCompilationExceptionsAreFatal'})
       bench_args += ['score', 'jruby-9000-dev-truffle-graal', '--show-commands', '--show-samples']
       raise 'specify a single benchmark for run - eg classic-fannkuch-redux' if args.size != 1
     when 'reference'

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes;
 
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -459,10 +460,20 @@ protected Object ruby(VirtualFrame frame, String expression, Object... arguments
     }
 
     protected Object rubyWithSelf(VirtualFrame frame, Object self, String expression, Object... arguments) {
-        notDesignedForCompilation();
-
+        final MaterializedFrame evalFrame = setupFrame(RubyArguments.getSelf(frame.getArguments()), arguments);
+
+        final RubyBinding binding = new RubyBinding(
+                getContext().getCoreLibrary().getBindingClass(),
+                self,
+                evalFrame);
+
+        return getContext().eval(expression, binding, true, "inline-ruby", this);
+    }
+
+    @CompilerDirectives.TruffleBoundary
+    private MaterializedFrame setupFrame(Object self, Object... arguments) {
         final MaterializedFrame evalFrame = Truffle.getRuntime().createMaterializedFrame(
-                RubyArguments.pack(null, null, RubyArguments.getSelf(frame.getArguments()), null, new Object[]{}));
+                RubyArguments.pack(null, null,self, null, new Object[]{}));
 
         if (arguments.length % 2 == 1) {
             throw new UnsupportedOperationException("odd number of name-value pairs for arguments");
@@ -472,12 +483,7 @@ protected Object rubyWithSelf(VirtualFrame frame, Object self, String expression
             evalFrame.setObject(evalFrame.getFrameDescriptor().findOrAddFrameSlot(arguments[n]), arguments[n + 1]);
         }
 
-        final RubyBinding binding = new RubyBinding(
-                getContext().getCoreLibrary().getBindingClass(),
-                self,
-                evalFrame);
-
-        return getContext().eval(ByteList.create(expression), binding, true, "inline-ruby", this);
+        return evalFrame;
     }
 
     protected RubyNilClass nil() {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
@@ -162,8 +162,6 @@ public GetIndexNode(GetIndexNode prev) {
 
         @Specialization(guards = "isNull")
         public Object getNull(VirtualFrame frame, RubyHash hash, Object key) {
-            notDesignedForCompilation();
-
             hashNode.call(frame, key, "hash", null);
 
             if (undefinedValue != null) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java
@@ -62,8 +62,6 @@ public CurrentNode(CurrentNode prev) {
 
         @Specialization
         public RubyThread current() {
-            notDesignedForCompilation();
-
             return getContext().getThreadManager().getCurrentThread();
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
@@ -235,16 +235,23 @@ public Object instanceEval(ByteList code, Object self, Node currentNode) {
         return instanceEval(code, self, "(eval)", currentNode);
     }
 
+    @TruffleBoundary
+    public Object eval(String code, RubyBinding binding, boolean ownScopeForAssignments, String filename, Node currentNode) {
+        return eval(ByteList.create(code), binding, ownScopeForAssignments, filename, currentNode);
+    }
+
     @TruffleBoundary
     public Object eval(ByteList code, RubyBinding binding, boolean ownScopeForAssignments, String filename, Node currentNode) {
         final Source source = Source.fromText(code, filename);
         return execute(source, code.getEncoding(), TranslatorDriver.ParserContext.EVAL, binding.getSelf(), binding.getFrame(), ownScopeForAssignments, currentNode, NodeWrapper.IDENTITY);
     }
 
+    @TruffleBoundary
     public Object eval(ByteList code, RubyBinding binding, boolean ownScopeForAssignments, Node currentNode) {
         return eval(code, binding, ownScopeForAssignments, "(eval)", currentNode);
     }
 
+    @TruffleBoundary
     public Object execute(Source source, Encoding defaultEncoding, TranslatorDriver.ParserContext parserContext, Object self, MaterializedFrame parentFrame, Node currentNode, NodeWrapper wrapper) {
         return execute(source, defaultEncoding, parserContext, self, parentFrame, true, currentNode, wrapper);
     }