jruby · Aug 5, 2015 · Aug 5, 2015 · Aug 5, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java
@@ -21,6 +21,7 @@
 package org.jruby.truffle.nodes.cast;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -86,6 +87,7 @@ public int cmpBignum(RubyBasicObject value, Object receiver, Object other) {
         return BignumNodes.getBigIntegerValue(value).signum();
     }
 
+    @TruffleBoundary
     @Specialization(guards = "isNil(nil)")
     public int cmpNil(Object nil, Object receiver, Object other) {
         throw new RaiseException(

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java
@@ -435,17 +435,22 @@ public Object encodingMap(VirtualFrame frame) {
             final Object externalTuple = getContext().makeTuple(frame, newTupleNode, createString("external"), indexLookup(encodings, defaultExternalEncoding));
             lookupTableWriteNode.call(frame, ret, "[]=", null, getSymbol("EXTERNAL"), externalTuple);
 
-            final Encoding localeEncoding = getContext().getRuntime().getEncodingService().getLocaleEncoding();
+            final Encoding localeEncoding = getLocaleEncoding();
             final Object localeTuple = getContext().makeTuple(frame, newTupleNode, createString("locale"), indexLookup(encodings, localeEncoding));
             lookupTableWriteNode.call(frame, ret, "[]=", null, getSymbol("LOCALE"), localeTuple);
 
-            final Encoding filesystemEncoding = getContext().getRuntime().getEncodingService().getLocaleEncoding();
+            final Encoding filesystemEncoding = getLocaleEncoding();
             final Object filesystemTuple = getContext().makeTuple(frame, newTupleNode, createString("filesystem"), indexLookup(encodings, filesystemEncoding));
             lookupTableWriteNode.call(frame, ret, "[]=", null, getSymbol("FILESYSTEM"), filesystemTuple);
 
             return ret;
         }
 
+        @TruffleBoundary
+        private Encoding getLocaleEncoding() {
+            return getContext().getRuntime().getEncodingService().getLocaleEncoding();
+        }
+
         @TruffleBoundary
         public Object indexLookup(RubyBasicObject[] encodings, Encoding encoding) {
             // TODO (nirvdrum 25-Mar-15): Build up this lookup table in RubyEncoding as we register encodings.

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.core;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
@@ -114,6 +115,7 @@ public BacktraceNode(RubyContext context, SourceSection sourceSection) {
             readCustomBacktrace = new ReadHeadObjectFieldNode("@custom_backtrace");
         }
 
+        @TruffleBoundary
         @Specialization
         public Object backtrace(RubyBasicObject exception) {
             if (readCustomBacktrace.isSet(exception)) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -889,6 +889,7 @@ public int hash(boolean value) {
             return Boolean.valueOf(value).hashCode();
         }
 
+        @TruffleBoundary
         @Specialization
         public int hash(RubyBasicObject self) {
             // TODO(CS 8 Jan 15) we shouldn't use the Java class hierarchy like this - every class should define it's
@@ -1969,6 +1970,7 @@ private RubyBasicObject finishFormat(ByteList format, PackResult result) {
             return string;
         }
 
+        @TruffleBoundary
         protected CallTarget compileFormat(RubyBasicObject format) {
             assert RubyGuards.isRubyString(format);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java
@@ -304,6 +304,7 @@ public RubyBasicObject toProcUncached(RubyBasicObject methodObject) {
                     null);
         }
 
+        @TruffleBoundary
         protected CallTarget method2proc(RubyBasicObject methodObject) {
             // translate to something like:
             // lambda { |same args list| method.call(args) }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ProcessNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ProcessNodes.java
@@ -84,6 +84,7 @@ protected Object clock_gettime_realtime(int clock_id, RubyBasicObject unit) {
             return timeToUnit(time, unit);
         }
 
+        @TruffleBoundary
         @Specialization(guards = { "isThreadCPUTime(clock_id)", "isRubySymbol(unit)" })
         protected Object clock_gettime_thread_cputime(int clock_id, RubyBasicObject unit,
                 @Cached("getLibCClockGetTime()") LibCClockGetTime libCClockGetTime) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java
@@ -76,6 +76,7 @@ public PushNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public RubyBasicObject push(RubyBasicObject self, final Object value) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -102,6 +103,7 @@ public RubyNode coerceToBoolean(RubyNode nonBlocking) {
             return BooleanCastWithDefaultNodeGen.create(getContext(), getSourceSection(), false, nonBlocking);
         }
 
+        @TruffleBoundary
         @Specialization(guards = "!nonBlocking")
         public Object popBlocking(RubyBasicObject self, boolean nonBlocking) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -114,6 +116,7 @@ public Object block() throws InterruptedException {
             });
         }
 
+        @TruffleBoundary
         @Specialization(guards = "nonBlocking")
         public Object popNonBlock(RubyBasicObject self, boolean nonBlocking) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -187,6 +190,7 @@ public EmptyNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public boolean empty(RubyBasicObject self) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -202,6 +206,7 @@ public SizeNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public int size(RubyBasicObject self) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -217,6 +222,7 @@ public ClearNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public RubyBasicObject clear(RubyBasicObject self) {
             final BlockingQueue<Object> queue = getQueue(self);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
@@ -640,6 +640,7 @@ public ToSNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public RubyBasicObject toS(RubyBasicObject regexp) {
             return createString(((org.jruby.RubyString) org.jruby.RubyRegexp.newRegexp(getContext().getRuntime(), getSource(regexp), getRegex(regexp).getOptions()).to_s()).getByteList());

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/SizedQueueNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/SizedQueueNodes.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes.core;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.CreateCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
@@ -107,6 +108,7 @@ public SetMaxNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public int setMax(RubyBasicObject self, int newCapacity) {
             if (newCapacity <= 0) {
@@ -136,6 +138,7 @@ public MaxNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public int max(RubyBasicObject self) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -178,6 +181,7 @@ public Boolean block() throws InterruptedException {
             return self;
         }
 
+        @TruffleBoundary
         @Specialization(guards = "nonBlocking")
         public RubyBasicObject pushNonBlock(RubyBasicObject self, final Object value, boolean nonBlocking) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -221,6 +225,7 @@ public Object block() throws InterruptedException {
             });
         }
 
+        @TruffleBoundary
         @Specialization(guards = "nonBlocking")
         public Object popNonBlock(RubyBasicObject self, boolean nonBlocking) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -243,6 +248,7 @@ public EmptyNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public boolean empty(RubyBasicObject self) {
             final BlockingQueue<Object> queue = getQueue(self);
@@ -273,6 +279,7 @@ public ClearNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public RubyBasicObject clear(RubyBasicObject self) {
             final BlockingQueue<Object> queue = getQueue(self);

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
@@ -1477,6 +1477,7 @@ public LstripBangNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization(guards = "isSingleByteOptimizable(string)")
         public Object lstripBangSingleByte(RubyBasicObject string) {
             // Taken from org.jruby.RubyString#lstrip_bang19 and org.jruby.RubyString#singleByteLStrip.
@@ -1501,6 +1502,7 @@ public Object lstripBangSingleByte(RubyBasicObject string) {
             return nil();
         }
 
+        @TruffleBoundary
         @Specialization(guards = "!isSingleByteOptimizable(string)")
         public Object lstripBang(RubyBasicObject string) {
             // Taken from org.jruby.RubyString#lstrip_bang19 and org.jruby.RubyString#multiByteLStrip.
@@ -1615,6 +1617,7 @@ public RstripBangNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization(guards = "isSingleByteOptimizable(string)")
         public Object rstripBangSingleByte(RubyBasicObject string) {
             // Taken from org.jruby.RubyString#rstrip_bang19 and org.jruby.RubyString#singleByteRStrip19.
@@ -1640,6 +1643,7 @@ public Object rstripBangSingleByte(RubyBasicObject string) {
             return nil();
         }
 
+        @TruffleBoundary
         @Specialization(guards = "!isSingleByteOptimizable(string)")
         public Object rstripBang(RubyBasicObject string) {
             // Taken from org.jruby.RubyString#rstrip_bang19 and org.jruby.RubyString#multiByteRStrip19.
@@ -1687,6 +1691,7 @@ public SwapcaseBangNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public RubyBasicObject swapcaseSingleByte(RubyBasicObject string) {
             // Taken from org.jruby.RubyString#swapcase_bang19.
@@ -1747,6 +1752,7 @@ public RubyBasicObject dumpAsciiCompatible(RubyBasicObject string) {
             return result;
         }
 
+        @TruffleBoundary
         @Specialization(guards = "!isAsciiCompatible(string)")
         public RubyBasicObject dump(RubyBasicObject string) {
             // Taken from org.jruby.RubyString#dump
@@ -1887,6 +1893,11 @@ public Object squeezeBang(VirtualFrame frame, RubyBasicObject string, Object...
             for (int i = 0; i < args.length; i++) {
                 otherStrings[i] = toStrNode.executeToStr(frame, args[i]);
             }
+            return performSqueezeBang(string, otherStrings);
+        }
+
+        @TruffleBoundary
+        private Object performSqueezeBang(RubyBasicObject string, RubyBasicObject[] otherStrings) {
 
             RubyBasicObject otherStr = otherStrings[0];
             Encoding enc = checkEncoding(string, getCodeRangeable(otherStr), this);

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
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes.core;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
@@ -377,6 +378,7 @@ public InitializeNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization(guards = "isRubyProc(block)")
         public RubyBasicObject initialize(RubyBasicObject thread, Object[] arguments, RubyBasicObject block) {
             ThreadNodes.initialize(thread, getContext(), this, arguments, block);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.core;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -97,6 +98,7 @@ public InternalSetGMTNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public boolean internalSetGMT(RubyBasicObject time, boolean isGMT) {
             if (isGMT) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayBuilderNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayBuilderNode.java
@@ -494,10 +494,6 @@ public Object appendArray(Object store, int index, RubyBasicObject array) {
 
         @Override
         public Object appendValue(Object store, int index, Object value) {
-            if (index >= ((Object[]) store).length) {
-                new Exception().printStackTrace();
-            }
-
             ((Object[]) store)[index] = value;
             return store;
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.*;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -2830,6 +2831,7 @@ public Object pack(VirtualFrame frame, RubyBasicObject array, Object format) {
             return ruby(frame, "pack(format.to_str)", "format", format);
         }
 
+        @TruffleBoundary
         protected CallTarget compileFormat(RubyBasicObject format) {
             assert RubyGuards.isRubyString(format);
             try {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TopLevelRaiseHandler.java b/truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TopLevelRaiseHandler.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.exceptions;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
@@ -33,18 +34,23 @@ public Object execute(VirtualFrame frame) {
         try {
             return body.execute(frame);
         } catch (RaiseException e) {
-            final Object rubyException = e.getRubyException();
-
-            for (String line : Backtrace.DISPLAY_FORMATTER.format(getContext(), (RubyBasicObject) rubyException, ExceptionNodes.getBacktrace((RubyBasicObject) rubyException))) {
-                System.err.println(line);
-            }
-
-            System.exit(1);
+            handleException(e);
         } catch (ThreadExitException e) {
             // Ignore
         }
 
         return nil();
     }
 
+    @TruffleBoundary
+    private void handleException(RaiseException e) {
+        final Object rubyException = e.getRubyException();
+
+        for (String line : Backtrace.DISPLAY_FORMATTER.format(getContext(), (RubyBasicObject) rubyException, ExceptionNodes.getBacktrace((RubyBasicObject) rubyException))) {
+            System.err.println(line);
+        }
+
+        System.exit(1);
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/globals/GetFromThreadLocalNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/globals/GetFromThreadLocalNode.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.globals;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
@@ -32,6 +33,7 @@ public GetFromThreadLocalNode(RubyContext context, SourceSection sourceSection)
         super(context, sourceSection);
     }
 
+    @TruffleBoundary
     @Specialization
     public Object get(ThreadLocalObject threadLocal) {
         return threadLocal.get();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/EncodingConverterPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/EncodingConverterPrimitiveNodes.java
@@ -12,6 +12,7 @@
 package org.jruby.truffle.nodes.rubinius;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
@@ -82,6 +83,7 @@ public Object encodingConverterPrimitiveConvert(RubyBasicObject encodingConverte
             return primitiveConvertHelper(encodingConverter, StringNodes.getByteList(source), source, target, offset, size, options);
         }
 
+        @TruffleBoundary
         private Object primitiveConvertHelper(RubyBasicObject encodingConverter, ByteList inBytes, RubyBasicObject source,
                                               RubyBasicObject target, int offset, int size, int options) {
             // Taken from org.jruby.RubyConverter#primitive_convert.