8300273: [IR framework] Handle <!-- safepoint while printing --> message instead of bailing out

Reviewed-by: thartmann, kvn

Author: chhagedorn

src/hotspot/share/compiler/compileTask.cpp

@@ -338,6 +338,7 @@ void CompileTask::log_task(xmlStream* log) {
 void CompileTask::log_task_queued() {
   ttyLocker ttyl;
   ResourceMark rm;
+  NoSafepointVerifier nsv;
 
   xtty->begin_elem("task_queued");
   log_task(xtty);

test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 import compiler.lib.ir_framework.driver.irmatching.IRMatcher;
 import compiler.lib.ir_framework.driver.irmatching.IRViolationException;
 import compiler.lib.ir_framework.driver.irmatching.Matchable;
-import compiler.lib.ir_framework.driver.irmatching.parser.MethodCompilationParser;
+import compiler.lib.ir_framework.driver.irmatching.parser.TestClassParser;
 import compiler.lib.ir_framework.shared.*;
 import compiler.lib.ir_framework.test.TestVM;
 import jdk.test.lib.Platform;
@@ -747,9 +747,9 @@ private void runTestVM(List<String> additionalFlags) {
         TestVMProcess testVMProcess = new TestVMProcess(additionalFlags, testClass, helperClasses, defaultWarmup);
         if (shouldVerifyIR) {
             try {
-                MethodCompilationParser methodCompilationParser = new MethodCompilationParser(testClass);
-                Matchable testClassMatchable = methodCompilationParser.parse(testVMProcess.getHotspotPidFileName(),
-                                                                             testVMProcess.getIrEncoding());
+                TestClassParser testClassParser = new TestClassParser(testClass);
+                Matchable testClassMatchable = testClassParser.parse(testVMProcess.getHotspotPidFileName(),
+                                                                     testVMProcess.getIrEncoding());
                 IRMatcher matcher = new IRMatcher(testClassMatchable);
                 matcher.match();
             } catch (IRViolationException e) {

test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/IRMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,26 +23,25 @@
 
 package compiler.lib.ir_framework.driver.irmatching;
 
-import compiler.lib.ir_framework.driver.irmatching.parser.MethodCompilationParser;
+import compiler.lib.ir_framework.driver.irmatching.parser.TestClassParser;
 import compiler.lib.ir_framework.driver.irmatching.report.CompilationOutputBuilder;
 import compiler.lib.ir_framework.driver.irmatching.report.FailureMessageBuilder;
 
 /**
- * This class performs IR matching on the prepared {@link TestClass} object parsed by {@link MethodCompilationParser}.
+ * This class performs IR matching on the prepared {@link TestClass} object parsed by {@link TestClassParser}.
  * All applicable @IR rules are matched with all their defined compilation phases. If there are any IR matching failures,
  * an {@link IRViolationException} is reported which provides a formatted failure message and the compilation outputs
  * of the failed compilation phases.
  */
 public class IRMatcher {
-    public static final String SAFEPOINT_WHILE_PRINTING_MESSAGE = "<!-- safepoint while printing -->";
     private final Matchable testClass;
 
     public IRMatcher(Matchable testClass) {
         this.testClass = testClass;
     }
 
     /**
-     * Do an IR matching of all methods with applicable @IR rules prepared with by the {@link MethodCompilationParser}.
+     * Do an IR matching of all methods with applicable @IR rules prepared with by the {@link TestClassParser}.
      */
     public void match() {
         MatchResult result = testClass.match();
@@ -58,20 +57,7 @@ public void match() {
      */
     private void reportFailures(MatchResult result) {
         String failureMsg = new FailureMessageBuilder(result).build();
-        String compilationOutput =  new CompilationOutputBuilder(result).build();
-        throwIfNoSafepointWhilePrinting(failureMsg, compilationOutput);
-    }
-
-    /**
-     * In some very rare cases, the hotspot_pid* file to IR match on contains "<!-- safepoint while printing -->"
-     * (emitted by ttyLocker::break_tty_for_safepoint) which might be the reason for a matching error.
-     * Do not throw an exception in this case (i.e. bailout).
-     */
-    private void throwIfNoSafepointWhilePrinting(String failures, String compilations) {
-        if (!compilations.contains(SAFEPOINT_WHILE_PRINTING_MESSAGE)) {
-            throw new IRViolationException(failures, compilations);
-        } else {
-            System.out.println("Found " + SAFEPOINT_WHILE_PRINTING_MESSAGE + ", bail out of IR matching");
-        }
+        String compilationOutput = new CompilationOutputBuilder(result).build();
+        throw new IRViolationException(failureMsg, compilationOutput);
     }
 }