src/share/vm/gc/g1/g1CollectorPolicy.cpp

rev 9422 : 8143251: HeapRetentionTest.java Test is failing on jdk9/dev
Reviewed-by:
rev 9423 : [mq]: 8143251-user-requested-cm-rev1

*** 1645,1657 ****
        // Initiate a new initial mark if there is no marking or reclamation going on.
        initiate_conc_mark();
        ergo_verbose0(ErgoConcCycles,
                      "initiate concurrent cycle",
                      ergo_format_reason("concurrent cycle initiation requested"));
!     } else if (_g1->user_requested_concurrent_full_gc(_g1->gc_cause())) {
!       // Initiate a user requested initial mark and update the collector state to
!       // reflect this.
        collector_state()->set_gcs_are_young(true);
        collector_state()->set_last_young_gc(false);
  
        initiate_conc_mark();
        ergo_verbose0(ErgoConcCycles,
--- 1645,1657 ----
        // Initiate a new initial mark if there is no marking or reclamation going on.
        initiate_conc_mark();
        ergo_verbose0(ErgoConcCycles,
                      "initiate concurrent cycle",
                      ergo_format_reason("concurrent cycle initiation requested"));
!     } else if (_g1->is_user_requested_concurrent_full_gc(_g1->gc_cause())) {
!       // Initiate a user requested initial mark. An initial mark must be young only
!       // GC, so the collector state must be updated to reflect this.
        collector_state()->set_gcs_are_young(true);
        collector_state()->set_last_young_gc(false);
  
        initiate_conc_mark();
        ergo_verbose0(ErgoConcCycles,