Skip to content

Commit 90dfce1

Browse files
committed
Ignore Error type in VerifyDebugUsage.
`BundleLauncher` raises `Error` and that lets `checkSVMInvariants()` fail.
1 parent 4beb8e8 commit 90dfce1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,24 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
8383
ResolvedJavaType nodeType = metaAccess.lookupJavaType(Node.class);
8484
ResolvedJavaType stringType = metaAccess.lookupJavaType(String.class);
8585
ResolvedJavaType graalErrorType = metaAccess.lookupJavaType(GraalError.class);
86+
ResolvedJavaType errorType = metaAccess.lookupJavaType(Error.class);
8687

8788
for (MethodCallTargetNode t : graph.getNodes(MethodCallTargetNode.TYPE)) {
8889
ResolvedJavaMethod callee = t.targetMethod();
8990
String calleeName = callee.getName();
90-
if (callee.getDeclaringClass().equals(debugType)) {
91+
ResolvedJavaType calleeDeclaringClass = callee.getDeclaringClass();
92+
if (calleeDeclaringClass.equals(debugType)) {
9193
boolean isDump = calleeName.equals("dump");
9294
if (calleeName.equals("log") || calleeName.equals("logAndIndent") || calleeName.equals("verify") || isDump) {
9395
verifyParameters(metaAccess, t, t.arguments(), stringType, isDump ? 2 : 1);
9496
}
9597
}
96-
if (callee.getDeclaringClass().isAssignableFrom(nodeType)) {
98+
if (calleeDeclaringClass.isAssignableFrom(nodeType)) {
9799
if (calleeName.equals("assertTrue") || calleeName.equals("assertFalse")) {
98100
verifyParameters(metaAccess, t, t.arguments(), stringType, 1);
99101
}
100102
}
101-
if (callee.getDeclaringClass().isAssignableFrom(graalErrorType) && !graph.method().getDeclaringClass().isAssignableFrom(graalErrorType)) {
103+
if (calleeDeclaringClass.isAssignableFrom(graalErrorType) && !calleeDeclaringClass.equals(errorType) && !graph.method().getDeclaringClass().isAssignableFrom(graalErrorType)) {
102104
if (calleeName.equals("guarantee")) {
103105
verifyParameters(metaAccess, t, t.arguments(), stringType, 0);
104106
}

0 commit comments

Comments
 (0)