src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp

rev 53772 : imported patch 8218672-aot-scan-wrong-position

*** 58,67 ****
--- 58,70 ----
    _gc_par_phases[ObjectSynchronizerRoots] = new WorkerDataArray<double>(max_gc_threads, "ObjectSynchronizer Roots (ms):");
    _gc_par_phases[ManagementRoots] = new WorkerDataArray<double>(max_gc_threads, "Management Roots (ms):");
    _gc_par_phases[SystemDictionaryRoots] = new WorkerDataArray<double>(max_gc_threads, "SystemDictionary Roots (ms):");
    _gc_par_phases[CLDGRoots] = new WorkerDataArray<double>(max_gc_threads, "CLDG Roots (ms):");
    _gc_par_phases[JVMTIRoots] = new WorkerDataArray<double>(max_gc_threads, "JVMTI Roots (ms):");
+ #if INCLUDE_AOT
+   _gc_par_phases[AOTCodeRoots] = new WorkerDataArray<double>(max_gc_threads, "AOT Root Scan (ms):");
+ #endif
    _gc_par_phases[CMRefRoots] = new WorkerDataArray<double>(max_gc_threads, "CM RefProcessor Roots (ms):");
    _gc_par_phases[WaitForStrongCLD] = new WorkerDataArray<double>(max_gc_threads, "Wait For Strong CLD (ms):");
    _gc_par_phases[WeakCLDRoots] = new WorkerDataArray<double>(max_gc_threads, "Weak CLD Roots (ms):");
    _gc_par_phases[SATBFiltering] = new WorkerDataArray<double>(max_gc_threads, "SATB Filtering (ms):");
  
*** 72,84 ****
      _gc_par_phases[ScanHCC] = NULL;
    }
    _gc_par_phases[ScanRS] = new WorkerDataArray<double>(max_gc_threads, "Scan RS (ms):");
    _gc_par_phases[OptScanRS] = new WorkerDataArray<double>(max_gc_threads, "Optional Scan RS (ms):");
    _gc_par_phases[CodeRoots] = new WorkerDataArray<double>(max_gc_threads, "Code Root Scanning (ms):");
- #if INCLUDE_AOT
-   _gc_par_phases[AOTCodeRoots] = new WorkerDataArray<double>(max_gc_threads, "AOT Root Scanning (ms):");
- #endif
    _gc_par_phases[ObjCopy] = new WorkerDataArray<double>(max_gc_threads, "Object Copy (ms):");
    _gc_par_phases[OptObjCopy] = new WorkerDataArray<double>(max_gc_threads, "Optional Object Copy (ms):");
    _gc_par_phases[Termination] = new WorkerDataArray<double>(max_gc_threads, "Termination (ms):");
    _gc_par_phases[GCWorkerTotal] = new WorkerDataArray<double>(max_gc_threads, "GC Worker Total (ms):");
    _gc_par_phases[GCWorkerEnd] = new WorkerDataArray<double>(max_gc_threads, "GC Worker End (ms):");
--- 75,84 ----
*** 387,399 ****
    if (G1HotCardCache::default_use_cache()) {
      trace_phase(_gc_par_phases[ScanHCC]);
    }
    debug_phase(_gc_par_phases[ScanRS]);
    debug_phase(_gc_par_phases[CodeRoots]);
- #if INCLUDE_AOT
-   debug_phase(_gc_par_phases[AOTCodeRoots]);
- #endif
    debug_phase(_gc_par_phases[ObjCopy]);
    debug_phase(_gc_par_phases[Termination]);
    debug_phase(_gc_par_phases[Other]);
    debug_phase(_gc_par_phases[GCWorkerTotal]);
    trace_phase(_gc_par_phases[GCWorkerEnd], false);
--- 387,396 ----
*** 501,522 ****
        "ObjectSynchronizerRoots",
        "ManagementRoots",
        "SystemDictionaryRoots",
        "CLDGRoots",
        "JVMTIRoots",
        "CMRefRoots",
        "WaitForStrongCLD",
        "WeakCLDRoots",
        "SATBFiltering",
        "UpdateRS",
        "ScanHCC",
        "ScanRS",
        "OptScanRS",
        "CodeRoots",
- #if INCLUDE_AOT
-       "AOTCodeRoots",
- #endif
        "ObjCopy",
        "OptObjCopy",
        "Termination",
        "Other",
        "GCWorkerTotal",
--- 498,519 ----
        "ObjectSynchronizerRoots",
        "ManagementRoots",
        "SystemDictionaryRoots",
        "CLDGRoots",
        "JVMTIRoots",
+ #if INCLUDE_AOT
+       "AOTCodeRoots",
+ #endif
        "CMRefRoots",
        "WaitForStrongCLD",
        "WeakCLDRoots",
        "SATBFiltering",
        "UpdateRS",
        "ScanHCC",
        "ScanRS",
        "OptScanRS",
        "CodeRoots",
        "ObjCopy",
        "OptObjCopy",
        "Termination",
        "Other",
        "GCWorkerTotal",