Mercurial > hg > graal-jvmci-8

diff src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp @ 22294:d86b226e331a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable derived oop processing by the GC with JVMCI
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Tue, 21 Jul 2015 15:00:07 -0700
parents 7848fc12602b
children c28cb37b2e1d
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Tue Jul 21 14:55:47 2015 +0200
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Tue Jul 21 15:00:07 2015 -0700
@@ -2547,7 +2547,9 @@
   if (UseAdaptiveSizePolicy) {
     size_policy()->ms_collection_begin();
   }
-  COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact);
+#if defined(COMPILER2) || defined(JVMCI)
+  DerivedPointerTableDeactivate dpt_deact;
+#endif
 
   HandleMark hm;  // Discard invalid handles created during verification
 
@@ -3021,7 +3023,9 @@
   // way with the marking information used by GC.
   NoRefDiscovery no_discovery(ref_processor());
 
-  COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+#if defined(COMPILER2) || defined(JVMCI)
+  DerivedPointerTableDeactivate dpt_deact;
+#endif
 
   // Clear any marks from a previous round
   verification_mark_bm()->clear_all();
@@ -3729,7 +3733,9 @@
   }
 
   {
-    COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+#if defined(COMPILER2) || defined(JVMCI)
+    DerivedPointerTableDeactivate dpt_deact;
+#endif
     if (CMSParallelInitialMarkEnabled && CollectedHeap::use_parallel_gc_threads()) {
       // The parallel version.
       FlexibleWorkGang* workers = gch->workers();
@@ -5119,7 +5125,9 @@
     }
 
     {
-      COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+#if defined(COMPILER2) || defined(JVMCI)
+      DerivedPointerTableDeactivate dpt_deact;
+#endif
 
       // Note on the role of the mod union table:
       // Since the marker in "markFromRoots" marks concurrently with