comparison src/share/vm/gc_implementation/g1/g1MarkSweep.cpp @ 22298:c28cb37b2e1d

Rename JVMCI to INCLUDE_JVMCI.
author twisti
date Wed, 22 Jul 2015 08:56:03 -0700
parents d86b226e331a
children dd9cc155639c
comparison
equal deleted inserted replaced
22297:571202729bbf 22298:c28cb37b2e1d
87 87
88 mark_sweep_phase1(marked_for_unloading, clear_all_softrefs); 88 mark_sweep_phase1(marked_for_unloading, clear_all_softrefs);
89 89
90 mark_sweep_phase2(); 90 mark_sweep_phase2();
91 91
92 #if defined(COMPILER2) || defined(JVMCI) 92 #if defined(COMPILER2) || INCLUDE_JVMCI
93 // Don't add any more derived pointers during phase3 93 // Don't add any more derived pointers during phase3
94 DerivedPointerTable::set_active(false); 94 DerivedPointerTable::set_active(false);
95 #endif 95 #endif
96 96
97 mark_sweep_phase3(); 97 mark_sweep_phase3();
170 // Delete entries for dead interned string and clean up unreferenced symbols in symbol table. 170 // Delete entries for dead interned string and clean up unreferenced symbols in symbol table.
171 G1CollectedHeap::heap()->unlink_string_and_symbol_table(&GenMarkSweep::is_alive); 171 G1CollectedHeap::heap()->unlink_string_and_symbol_table(&GenMarkSweep::is_alive);
172 172
173 if (VerifyDuringGC) { 173 if (VerifyDuringGC) {
174 HandleMark hm; // handle scope 174 HandleMark hm; // handle scope
175 #if defined(COMPILER2) || defined(JVMCI) 175 #if defined(COMPILER2) || INCLUDE_JVMCI
176 DerivedPointerTableDeactivate dpt_deact; 176 DerivedPointerTableDeactivate dpt_deact;
177 #endif 177 #endif
178 Universe::heap()->prepare_for_verify(); 178 Universe::heap()->prepare_for_verify();
179 // Note: we can verify only the heap here. When an object is 179 // Note: we can verify only the heap here. When an object is
180 // marked, the previous value of the mark word (including 180 // marked, the previous value of the mark word (including