8304681: compiler/sharedstubs/SharedStubToInterpTest.java fails after JDK-8304387

Reviewed-by: eastigeevich, kvn, shade

Author: zhengxiaolinX

test/hotspot/jtreg/ProblemList.txt

@@ -69,8 +69,6 @@ compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
 
 compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64
 
-compiler/sharedstubs/SharedStubToInterpTest.java 8304681 generic-all
-
 #############################################################################
 
 # :hotspot_gc

test/hotspot/jtreg/compiler/sharedstubs/SharedStubToInterpTest.java

@@ -29,15 +29,16 @@
  * @library /test/lib
  *
  * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="i386" | os.arch=="x86" | os.arch=="aarch64" | os.arch=="riscv64"
+ * @requires vm.debug
  *
  * @run driver compiler.sharedstubs.SharedStubToInterpTest
  */
 
 package compiler.sharedstubs;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.regex.Pattern;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -50,6 +51,7 @@ private static void runTest(String compiler, String test) throws Exception {
         command.add(compiler);
         command.add("-XX:+UnlockDiagnosticVMOptions");
         command.add("-Xbatch");
+        command.add("-XX:+PrintRelocations");
         command.add("-XX:CompileCommand=compileonly," + testClassName + "::" + "test");
         command.add("-XX:CompileCommand=dontinline," + testClassName + "::" + "test");
         command.add("-XX:CompileCommand=print," + testClassName + "::" + "test");
@@ -82,48 +84,14 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    private static String skipTo(Iterator<String> iter, String substring) {
-        while (iter.hasNext()) {
-            String nextLine = iter.next();
-            if (nextLine.contains(substring)) {
-                return nextLine;
-            }
-        }
-        return null;
-    }
-
     private static void checkOutput(OutputAnalyzer output) {
-        Iterator<String> iter = output.asLines().listIterator();
-
-        String match = skipTo(iter, "Compiled method");
-        while (match != null && !match.contains("Test::test")) {
-            match = skipTo(iter, "Compiled method");
-        }
-        if (match == null) {
-            throw new RuntimeException("Missing compiler output for the method 'test'");
-        }
-
-        while (iter.hasNext()) {
-            String nextLine = iter.next();
-            if (nextLine.contains("{static_stub}")) {
-                // Static stubs must be created at the end of the Stub section.
-                throw new RuntimeException("Found {static_stub} before Deopt Handler Code");
-            } else if (nextLine.contains("{runtime_call DeoptimizationBlob}")) {
-                // Shared static stubs are put after Deopt Handler Code.
-                break;
-            }
-        }
-
-        int foundStaticStubs = 0;
-        while (iter.hasNext()) {
-            if (iter.next().contains("{static_stub}")) {
-                foundStaticStubs += 1;
-            }
-        }
-
-        final int expectedStaticStubs = 2;
-        if (foundStaticStubs != expectedStaticStubs) {
-            throw new RuntimeException("Found static stubs: " + foundStaticStubs + "; Expected static stubs: " + expectedStaticStubs);
+        List<String> addrs = Pattern.compile("\\(static_stub\\) addr=(\\w+) .*\\[static_call=")
+            .matcher(output.getStdout())
+            .results()
+            .map(m -> m.group(1))
+            .toList();
+        if (addrs.stream().distinct().count() >= addrs.size()) {
+            throw new RuntimeException("No static stubs reused: distinct " + addrs.stream().distinct().count() + ", in total " + addrs.size());
         }
     }
 

test/hotspot/jtreg/compiler/sharedstubs/SharedTrampolineTest.java

@@ -81,24 +81,14 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    private static String skipTo(Iterator<String> iter, String substring) {
-        while (iter.hasNext()) {
-            String nextLine = iter.next();
-            if (nextLine.contains(substring)) {
-                return nextLine;
-            }
-        }
-        return null;
-    }
-
     private static void checkOutput(OutputAnalyzer output) {
         List<String> addrs = Pattern.compile("\\(trampoline_stub\\) addr=(\\w+) .*\\[trampoline owner")
             .matcher(output.getStdout())
             .results()
             .map(m -> m.group(1))
-            .collect(Collectors.toList());
+            .toList();
         if (addrs.stream().distinct().count() >= addrs.size()) {
-            throw new RuntimeException("No stubs reused");
+            throw new RuntimeException("No runtime trampoline stubs reused: distinct " + addrs.stream().distinct().count() + ", in total " + addrs.size());
         }
     }