[JDK-8347367] Ensure that fields loaded by InvocationPlugins are properly type checked

PullRequest: graal/19905

Author: tkrodriguez

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiNode.java

@@ -188,7 +188,7 @@ public static boolean intrinsify(GraphBuilderContext b, ValueNode object, Resolv
                         nonNull || StampTool.isPointerNonNull(object.stamp(NodeView.DEFAULT)));
         ValueNode value = canonical(object, stamp, (GuardingNode) guard, null);
         if (value == null) {
-            value = new PiNode(object, stamp);
+            value = new PiNode(object, stamp, guard);
         }
         b.push(JavaKind.Object, b.append(value));
         return true;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java

@@ -2407,8 +2407,9 @@ public ValueNode readEmbeddedAESCryptKArrayStart(GraphBuilderContext b,
             ResolvedJavaField embeddedCipherField = helper.getField(receiverType, "embeddedCipher");
             ValueNode embeddedCipher = b.nullCheckedValue(helper.loadField(receiver, embeddedCipherField));
             LogicNode typeCheck = InstanceOfNode.create(TypeReference.create(b.getAssumptions(), typeAESCrypt), embeddedCipher);
-            helper.doFallbackIfNot(typeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
-            return readFieldArrayStart(b, helper, typeAESCrypt, "K", embeddedCipher, JavaKind.Int);
+            GuardingNode guard = helper.doFallbackIfNot(typeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
+            ValueNode cast = b.add(PiNode.create(embeddedCipher, StampFactory.objectNonNull(TypeReference.create(b.getAssumptions(), typeAESCrypt)), guard.asNode()));
+            return readFieldArrayStart(b, helper, typeAESCrypt, "K", cast, JavaKind.Int);
         }
     }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopySnippets.java

@@ -306,15 +306,16 @@ protected void doExactArraycopyWithExpandedLoopSnippet(Object src, int srcPos, O
         long sourceOffset = arrayBaseOffset + srcPos * scale;
         long destOffset = arrayBaseOffset + destPos * scale;
 
-        GuardingNode anchor = SnippetAnchorNode.anchor();
         if (probability(FREQUENT_PROBABILITY, src == dest) && probability(NOT_FREQUENT_PROBABILITY, srcPos < destPos)) {
             // bad aliased case so we need to copy the array from back to front
             for (int position = length - 1; probability(FAST_PATH_PROBABILITY, position >= 0); position--) {
+                GuardingNode anchor = SnippetAnchorNode.anchor();
                 Object value = GuardedUnsafeLoadNode.guardedLoad(src, sourceOffset + position * scale, elementKind, arrayLocation, anchor);
                 RawStoreNode.storeObject(dest, destOffset + position * scale, value, elementKind, arrayLocation, true);
             }
         } else {
             for (int position = 0; probability(FAST_PATH_PROBABILITY, position < length); position++) {
+                GuardingNode anchor = SnippetAnchorNode.anchor();
                 Object value = GuardedUnsafeLoadNode.guardedLoad(src, sourceOffset + position * scale, elementKind, arrayLocation, anchor);
                 RawStoreNode.storeObject(dest, destOffset + position * scale, value, elementKind, arrayLocation, true);
             }