[Truffle] Remove conflicting boundaries.

jruby · Aug 19, 2015 · bf77585 · bf77585
1 parent 99d77ac
commit bf77585
Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
@@ -103,7 +103,6 @@ public EachObjectNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
-        @TruffleBoundary
         @Specialization(guards = "isRubyProc(block)")
         public int eachObject(VirtualFrame frame, NotProvided ofClass, DynamicObject block) {
             CompilerDirectives.transferToInterpreter();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/globals/ReadMatchReferenceNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/globals/ReadMatchReferenceNode.java
@@ -9,10 +9,11 @@
  */
 package org.jruby.truffle.nodes.globals;
 
-import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.layouts.Layouts;
@@ -33,9 +34,13 @@ public ReadMatchReferenceNode(RubyContext context, SourceSection sourceSection,
         this.index = index;
     }
 
-    @CompilerDirectives.TruffleBoundary
     @Override
     public Object execute(VirtualFrame frame) {
+        return readMatchReference();
+    }
+
+    @TruffleBoundary
+    private Object readMatchReference() {
         DynamicObject receiver = Layouts.THREAD.getThreadLocals(getContext().getThreadManager().getCurrentThread());
         final Object match = receiver.get("$~", Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(receiver)).getContext().getCoreLibrary().getNilObject());