[Truffle] Remove conflicting TruffleBoundary with VirtualFrame.

jruby · May 3, 2015 · ef5da87 · nirvdrum · May 3, 2015 · chrisseaton
1 parent 017683b
commit ef5da87
Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
@@ -83,7 +83,6 @@ public Object coerceBasicObject(VirtualFrame frame, RubyBasicObject object) {
         return coerceObject(frame, object);
     }
 
-    @CompilerDirectives.TruffleBoundary
     private Object coerceObject(VirtualFrame frame, Object object) {
         if (toIntNode == null) {
             CompilerDirectives.transferToInterpreter();
@@ -97,9 +96,7 @@ private Object coerceObject(VirtualFrame frame, Object object) {
         } catch (RaiseException e) {
             if (e.getRubyException().getLogicalClass() == getContext().getCoreLibrary().getNoMethodErrorClass()) {
                 CompilerDirectives.transferToInterpreter();
-
-                throw new RaiseException(
-                        getContext().getCoreLibrary().typeErrorNoImplicitConversion(object, "Integer", this));
+                throw new RaiseException(getContext().getCoreLibrary().typeErrorNoImplicitConversion(object, "Integer", this));
             } else {
                 throw e;
             }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -899,8 +899,9 @@ public Object deleteBang(VirtualFrame frame, RubyString string, Object... otherS
             return deleteBangSlow(frame, string, otherStrings);
         }
 
-        @CompilerDirectives.TruffleBoundary
         private Object deleteBangSlow(VirtualFrame frame, RubyString string, Object... args) {
+            notDesignedForCompilation();
+
             RubyString[] otherStrings = new RubyString[args.length];
 
             for (int i = 0; i < args.length; i++) {