# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1432851018 25200
# Node ID 8a01110bfbaf5878eadb63d69dc99e42b2bb96e0
# Parent  9c2c8e4b5333d910a72c428ce6c45dd29d9da0fc# Parent  fad97102875561c0cecb2da155cdf0a1bc3cdaa8
Merge with fad97102875561c0cecb2da155cdf0a1bc3cdaa8

diff -r 9c2c8e4b5333 -r 8a01110bfbaf 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 May 28 10:16:13 2015 -0700
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Thu May 28 15:10:18 2015 -0700
@@ -3067,7 +3067,7 @@
                     ResolvedJavaType resolvedType = (ResolvedJavaType) type;
                     JavaTypeProfile profile = getProfileForTypeCheck(resolvedType);
                     TypeCheckPlugin typeCheckPlugin = this.graphBuilderConfig.getPlugins().getTypeCheckPlugin();
-                    if (typeCheckPlugin == null || !typeCheckPlugin.checkCast(this, object, resolvedType, profile)) {
+                    if (typeCheckPlugin == null || !this.parsingIntrinsic() || !typeCheckPlugin.checkCast(this, object, resolvedType, profile)) {
                         ValueNode checkCastNode = null;
                         if (profile != null) {
                             if (profile.getNullSeen().isFalse()) {