[Truffle] Replaced some more transfers with boundaries.

jruby · Mar 10, 2016 · bad3d2e · bad3d2e
1 parent 0dced16
commit bad3d2e
Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java
@@ -234,9 +234,8 @@ public Object getIndexString(DynamicObject matchData, DynamicObject index, NotPr
         }
 
         @Specialization(guards = {"!isRubySymbol(index)", "!isRubyString(index)", "!isIntegerFixnumRange(index)"})
+        @TruffleBoundary
         public Object getIndex(VirtualFrame frame, DynamicObject matchData, Object index, NotProvided length) {
-            CompilerDirectives.transferToInterpreter();
-
             if (toIntNode == null) {
                 CompilerDirectives.transferToInterpreter();
                 toIntNode = insert(ToIntNodeGen.create(getContext(), getSourceSection(), null));

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -1580,8 +1580,8 @@ public OrdNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization(guards = "isEmpty(string)")
+        @TruffleBoundary
         public int ordEmpty(DynamicObject string) {
-            CompilerDirectives.transferToInterpreter();
             throw new RaiseException(coreLibrary().argumentError("empty string", this));
         }