test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java

@@ -161,11 +161,11 @@
              System.out.println("Could not find \"" + preCodeBlobSectionHeader + "\" in " + hsErrPath);
              System.out.println("Looks like hs-err is truncated - exiting with success");
              return;
          }
  
-         Matcher matcher = Pattern.compile("\\[MachCode\\]\\s*\\[Verified Entry Point\\]\\s*  # \\{method\\} \\{[^}]*\\} '([^']+)' '([^']+)' in '([^']+)'", Pattern.DOTALL).matcher(hsErr);
+         Matcher matcher = Pattern.compile("\\[MachCode\\]\\s[^{]+\\{method\\} \\{[^}]*\\} '([^']+)' '([^']+)' in '([^']+)'", Pattern.DOTALL).matcher(hsErr);
          List<String> machCodeHeaders = matcher.results().map(mr -> String.format("'%s' '%s' in '%s'", mr.group(1), mr.group(2), mr.group(3))).collect(Collectors.toList());
          int minExpectedMachCodeSections = Math.max(1, compiledJavaFrames);
          if (machCodeHeaders.size() < minExpectedMachCodeSections) {
              Asserts.fail(machCodeHeaders.size() + " < " + minExpectedMachCodeSections);
          }