From 1b93b81270770c208efc8c9bb10bb460636008b7 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 19 May 2021 11:29:27 +0000
Subject: [PATCH] 8267133:
 jdk/jfr/event/gc/collection/TestG1ParallelPhases.java fails with Not expected
 phases: RestorePreservedMarks, RemoveSelfForwardingPtr: expected true, was
 false 8267218: jdk/jfr/event/gc/collection/TestG1ParallelPhases.java fails
 with Not found phases\: StringDedupQueueFixup, StringDedupTableFixup

Co-authored-by: Thomas Schatzl <tschatzl@openjdk.org>
Reviewed-by: tschatzl, iwalulya
---
 test/jdk/ProblemList.txt                                    | 1 -
 .../jdk/jfr/event/gc/collection/TestG1ParallelPhases.java   | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 574565c0cdc..e2c24206fd6 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -833,7 +833,6 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8225209    gener
 jdk/jfr/event/os/TestThreadContextSwitches.java                 8247776 windows-all
 jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
 jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
-jdk/jfr/event/gc/collection/TestG1ParallelPhases.java           8267133 generic-all
 
 ############################################################################
 
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
index 9872d399041..a29ce4cc197 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
@@ -104,8 +104,6 @@ public static void main(String[] args) throws IOException {
             "CodeRoots",
             "ObjCopy",
             "Termination",
-            "StringDedupQueueFixup",
-            "StringDedupTableFixup",
             "RedirtyCards",
             "RecalculateUsed",
             "ResetHotCardCache",
@@ -123,6 +121,10 @@ public static void main(String[] args) throws IOException {
         // Some GC phases may or may not occur depending on environment. Filter them out
         // since we can not reliably guarantee that they occur (or not).
         Set<String> optPhases = of(
+            // The following two phases only occur on evacuation failure.
+            "RemoveSelfForwardingPtr",
+            "RestorePreservedMarks",
+
             "OptScanHR",
             "OptMergeRS",
             "OptCodeRoots",