# HG changeset patch # User Doug Simon # Date 1426172620 -3600 # Node ID 97a72dcdac8d2492683c70e432c99915432ae4a2 # Parent 1e27e31aca116a17049eb4edda1eb63f7111ff5e disallow intrinsics from calling the original method diff -r 1e27e31aca11 -r 97a72dcdac8d graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 12 15:25:43 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 12 16:03:40 2015 +0100 @@ -1210,11 +1210,11 @@ } ReplacementContext context = this.replacementContext; if (context != null && context.isCallToOriginal(targetMethod)) { + assert context.asIntrinsic() == null : "intrinsic cannot call the method it is intrinsifying"; // Self recursive replacement means the original // method should be called. if (context.method.hasBytecodes()) { - IntrinsicContext intrinsic = context.asIntrinsic(); - parseAndInlineCallee(context.method, args, intrinsic); + parseAndInlineCallee(context.method, args, null); } else { return false; }