Automatic merge of jdk:master into master

duke · duke · commit a8a83bac36b3 · 2022-03-10T15:09:44.000Z
diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
@@ -125,9 +125,9 @@ static void testIndy() throws IOException {
 
         analyzer.shouldHaveExitValue(0);
 
-        analyzer.shouldNotContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes)   not inlineable");
+        analyzer.shouldNotMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\)   not inlineable");
 
-        analyzer.shouldContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes)   force inline by annotation");
+        analyzer.shouldMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\)   force inline by annotation");
         analyzer.shouldContain("java/lang/invoke/MethodHandle::invokeBasic (not loaded)   not inlineable");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,9 @@ static void testIndy() throws IOException {`
`125`	`125`
`126`	`126`	`analyzer.shouldHaveExitValue(0);`
`127`	`127`
`128`		`- analyzer.shouldNotContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes) not inlineable");`
	`128`	`+ analyzer.shouldNotMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) not inlineable");`
`129`	`129`
`130`		`- analyzer.shouldContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes) force inline by annotation");`
	`130`	`+ analyzer.shouldMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) force inline by annotation");`
`131`	`131`	`analyzer.shouldContain("java/lang/invoke/MethodHandle::invokeBasic (not loaded) not inlineable");`
`132`	`132`	`}`
`133`	`133`