--- 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;
                     }