[GR-66024] Handle field types and return types that are unresolved in VerifyUsageWithEquals

PullRequest: graal/21126

Author: dougxc

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUsageWithEquals.java

@@ -115,21 +115,19 @@ private static boolean isTrustedInterface(Class<?> cls) {
     private boolean isAssignableToRestrictedType(ValueNode node, MetaAccessProvider metaAccess) {
         if (node.stamp(NodeView.DEFAULT) instanceof ObjectStamp) {
             ResolvedJavaType restrictedType = metaAccess.lookupJavaType(restrictedClass);
-            ResolvedJavaType nodeType = StampTool.typeOrNull(node);
-            if (nodeType == null && node instanceof LoadFieldNode) {
-                nodeType = (ResolvedJavaType) ((LoadFieldNode) node).field().getType();
+            JavaType nodeType = StampTool.typeOrNull(node);
+            if (nodeType == null && node instanceof LoadFieldNode load) {
+                nodeType = load.field().getType();
             }
-            if (nodeType == null && node instanceof Invoke) {
-                ResolvedJavaMethod target = ((Invoke) node).callTarget().targetMethod();
-                nodeType = (ResolvedJavaType) target.getSignature().getReturnType(target.getDeclaringClass());
+            if (nodeType == null && node instanceof Invoke invoke) {
+                ResolvedJavaMethod target = invoke.callTarget().targetMethod();
+                nodeType = target.getSignature().getReturnType(target.getDeclaringClass());
             }
-            if (nodeType == null && node instanceof UncheckedInterfaceProvider) {
-                nodeType = StampTool.typeOrNull(((UncheckedInterfaceProvider) node).uncheckedStamp());
+            if (nodeType == null && node instanceof UncheckedInterfaceProvider uip) {
+                nodeType = StampTool.typeOrNull(uip.uncheckedStamp());
             }
 
-            if (nodeType != null && restrictedType.isAssignableFrom(nodeType)) {
-                return true;
-            }
+            return nodeType instanceof ResolvedJavaType resolved && restrictedType.isAssignableFrom(resolved);
         }
         return false;
     }
@@ -162,9 +160,7 @@ private static boolean isEqualsMethod(ResolvedJavaMethod method) {
             if (sig.getReturnKind() == JavaKind.Boolean) {
                 if (sig.getParameterCount(false) == 1) {
                     ResolvedJavaType ptype = (ResolvedJavaType) sig.getParameterType(0, method.getDeclaringClass());
-                    if (ptype.isJavaLangObject()) {
-                        return true;
-                    }
+                    return ptype.isJavaLangObject();
 
                 }
             }
@@ -184,10 +180,7 @@ private boolean isIllegalUsage(ResolvedJavaMethod method, ValueNode x, ValueNode
         if ((isAssignableToRestrictedType(x, context.getMetaAccess()) || isAssignableToRestrictedType(y, context.getMetaAccess())) &&
                         !isSafeConstant(x, context.getConstantReflection(), context.getSnippetReflection()) &&
                         !isSafeConstant(y, context.getConstantReflection(), context.getSnippetReflection())) {
-            if (isEqualsMethod(method) && (isThisParameter(x) || isThisParameter(y))) {
-                return false;
-            }
-            return true;
+            return !isEqualsMethod(method) || (!isThisParameter(x) && !isThisParameter(y));
         }
         return false;
     }