Mercurial > hg > truffle

changeset 18138:4c49f062d136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: corrected references to @SlowPath (now @TruffleBoundary).
author Danilo Ansaloni <danilo.ansaloni@oracle.com>
date Tue, 21 Oct 2014 11:23:37 +0200
parents 94faadc823ea
children 9147ad23314b
files graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLTestSlowPath01Builtin.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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")
--- 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);