Integrated: 8267133: jdk/jfr/event/gc/collection/TestG1ParallelPhases.java fails with Not expected phases: RestorePreservedMarks, RemoveSelfForwardingPtr: expected true, was false

[Albert Mingkun Yang]

On Mon, 17 May 2021 11:57:06 GMT, Albert Mingkun Yang <ayang at openjdk.org> wrote:

> `RestorePreservedMarks`, and `RemoveSelfForwardingPtr` are conditionally emitted (only on evac failure). Updating the test to exclude these events in the assert.
> 
> 
> double G1GCPhaseTimes::print_post_evacuate_collection_set() const {
>   ...
>   debug_phase(_gc_par_phases[RecalculateUsed], 1);
>   if (G1CollectedHeap::heap()->evacuation_failed()) {
>     debug_phase(_gc_par_phases[RemoveSelfForwardingPtr], 1);
>   }
> 
>   debug_time("Post Evacuate Cleanup 2", _cur_post_evacuate_cleanup_2_time_ms);
>   if (G1CollectedHeap::heap()->evacuation_failed()) {
>     debug_phase(_gc_par_phases[RecalculateUsed], 1);
>     debug_phase(_gc_par_phases[RestorePreservedMarks], 1);
>   }
>   ...
> }
> 
> 
> Tested: manually set a smaller heap size to see the test fail, but pass with the PR.

This pull request has now been integrated.

Changeset: 1b93b812
Author:    Albert Mingkun Yang <ayang at openjdk.org>
URL:       https://git.openjdk.java.net/jdk/commit/1b93b81270770c208efc8c9bb10bb460636008b7
Stats:     7 lines in 2 files changed: 4 ins; 3 del; 0 mod

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 at openjdk.org>
Reviewed-by: tschatzl, iwalulya

-------------

PR: https://git.openjdk.java.net/jdk/pull/4056