8354408: [lworld] compiler/types/TestSubTypeCheckUniqueSubclass.java IR mismatches post jdk-25+16 merge

Quan Anh Mai · TobiHartmann · commit 1163cc6556e9 · 2025-05-05T11:38:57.000Z
Reviewed-by: chagedorn, thartmann
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
@@ -82,7 +82,6 @@ compiler/ciReplay/TestInliningProtectionDomain.java 8349191 generic-all
 compiler/ciReplay/TestIncrementalInlining.java 8349191 generic-all
 
 compiler/startup/StartupOutput.java 8354404 generic-all
-compiler/types/TestSubTypeCheckUniqueSubclass.java 8354408 generic-all
 compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java 8354283 generic-all
 
 #############################################################################
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1970,7 +1970,8 @@ public class IRNode {
 
     public static final String SUBTYPE_CHECK = PREFIX + "SUBTYPE_CHECK" + POSTFIX;
     static {
-        macroNodes(SUBTYPE_CHECK, "SubTypeCheck");
+        String regex = START + "SubTypeCheck" + MID + END;
+        macroNodes(SUBTYPE_CHECK, regex);
     }
 
     public static final String TRAP = PREFIX + "TRAP" + POSTFIX;

Original file line number	Diff line number	Diff line change
`@@ -1970,7 +1970,8 @@ public class IRNode {`
`1970`	`1970`
`1971`	`1971`	`public static final String SUBTYPE_CHECK = PREFIX + "SUBTYPE_CHECK" + POSTFIX;`
`1972`	`1972`	`static {`
`1973`		`- macroNodes(SUBTYPE_CHECK, "SubTypeCheck");`
	`1973`	`+ String regex = START + "SubTypeCheck" + MID + END;`
	`1974`	`+ macroNodes(SUBTYPE_CHECK, regex);`
`1974`	`1975`	`}`
`1975`	`1976`
`1976`	`1977`	`public static final String TRAP = PREFIX + "TRAP" + POSTFIX;`