# HG changeset patch # User Danilo Ansaloni # Date 1413883417 -7200 # Node ID 4c49f062d136ba3fd54c9efd5eaf820086789353 # Parent 94faadc823ea7d1a2803a504cb9549a7cf27bd21 Truffle: corrected references to @SlowPath (now @TruffleBoundary). diff -r 94faadc823ea -r 4c49f062d136 graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLTestSlowPath01Builtin.java --- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLTestSlowPath01Builtin.java Tue Oct 21 10:28:43 2014 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLTestSlowPath01Builtin.java Tue Oct 21 11:23:37 2014 +0200 @@ -31,7 +31,7 @@ import com.oracle.truffle.sl.runtime.*; /** - * Just used in TestSlowPath01.sl. Verifies that all intrinsics have no effect inside of a @SlowPath + * Just used in TestSlowPath01.sl. Verifies that all intrinsics have no effect inside of a @TruffleBoundary * annotated method. */ @NodeInfo(shortName = "testSlowPath01") diff -r 94faadc823ea -r 4c49f062d136 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java Tue Oct 21 10:28:43 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java Tue Oct 21 11:23:37 2014 +0200 @@ -289,7 +289,7 @@ if (inlineGraph == this.markerGraph) { // Can happen for recursive calls. throw GraphUtil.approxSourceException(methodCallTargetNode, new IllegalStateException("Found illegal recursive call to " + methodCallTargetNode.targetMethod() + - ", must annotate such calls with @CompilerDirectives.SlowPath!")); + ", must annotate such calls with @TruffleBoundary!")); } Invoke invoke = methodCallTargetNode.invoke(); InliningUtil.inline(invoke, inlineGraph, true, null);