# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1432851545 -7200
# Node ID 2270a708ef23b28c7bb8725adcb80af10ebc7da7
# Parent  4f63449b442266a2fa78ca999024e9fecaf97772# Parent  fad97102875561c0cecb2da155cdf0a1bc3cdaa8
Merge.

diff -r 4f63449b4422 -r 2270a708ef23 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	Fri May 29 00:06:22 2015 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Fri May 29 00:19:05 2015 +0200
@@ -3068,7 +3068,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()) {
diff -r 4f63449b4422 -r 2270a708ef23 src/share/vm/jvmci/jvmciRuntime.cpp
diff -r 4f63449b4422 -r 2270a708ef23 src/share/vm/jvmci/jvmciRuntime.hpp