Ignore Error type in VerifyDebugUsage.

`BundleLauncher` raises `Error` and that lets `checkSVMInvariants()` fail.
oracle · Nov 6, 2023 · ae2de06 · ae2de06
1 parent 9b89841
commit ae2de06
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsage.java
@@ -83,22 +83,24 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
         ResolvedJavaType nodeType = metaAccess.lookupJavaType(Node.class);
         ResolvedJavaType stringType = metaAccess.lookupJavaType(String.class);
         ResolvedJavaType graalErrorType = metaAccess.lookupJavaType(GraalError.class);
+        ResolvedJavaType errorType = metaAccess.lookupJavaType(Error.class);
 
         for (MethodCallTargetNode t : graph.getNodes(MethodCallTargetNode.TYPE)) {
             ResolvedJavaMethod callee = t.targetMethod();
             String calleeName = callee.getName();
-            if (callee.getDeclaringClass().equals(debugType)) {
+            ResolvedJavaType calleeDeclaringClass = callee.getDeclaringClass();
+            if (calleeDeclaringClass.equals(debugType)) {
                 boolean isDump = calleeName.equals("dump");
                 if (calleeName.equals("log") || calleeName.equals("logAndIndent") || calleeName.equals("verify") || isDump) {
                     verifyParameters(metaAccess, t, t.arguments(), stringType, isDump ? 2 : 1);
                 }
             }
-            if (callee.getDeclaringClass().isAssignableFrom(nodeType)) {
+            if (calleeDeclaringClass.isAssignableFrom(nodeType)) {
                 if (calleeName.equals("assertTrue") || calleeName.equals("assertFalse")) {
                     verifyParameters(metaAccess, t, t.arguments(), stringType, 1);
                 }
             }
-            if (callee.getDeclaringClass().isAssignableFrom(graalErrorType) && !graph.method().getDeclaringClass().isAssignableFrom(graalErrorType)) {
+            if (calleeDeclaringClass.isAssignableFrom(graalErrorType) && !calleeDeclaringClass.equals(errorType) && !graph.method().getDeclaringClass().isAssignableFrom(graalErrorType)) {
                 if (calleeName.equals("guarantee")) {
                     verifyParameters(metaAccess, t, t.arguments(), stringType, 0);
                 }