src/hotspot/cpu/x86/c1_Runtime1_x86.cpp

rev 50076 : Fold Partial GC into Traversal GC

@@ -1571,11 +1571,11 @@
           __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);
           __ should_not_reach_here();
           break;
         }
 
-        if (bs->kind() == BarrierSet::Shenandoah && !(ShenandoahSATBBarrier || ShenandoahConditionalSATBBarrier || ShenandoahStoreValEnqueueBarrier)) {
+        if (bs->kind() == BarrierSet::Shenandoah && !(ShenandoahSATBBarrier || ShenandoahStoreValEnqueueBarrier)) {
           break;
         }
 
         __ push(rax);
         __ push(rdx);

@@ -1596,11 +1596,11 @@
         Label done;
         Label runtime;
 
         if (UseShenandoahGC) {
           Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
-          __ testb(gc_state, ShenandoahHeap::MARKING | ShenandoahHeap::PARTIAL | ShenandoahHeap::TRAVERSAL);
+          __ testb(gc_state, ShenandoahHeap::MARKING | ShenandoahHeap::TRAVERSAL);
           __ jcc(Assembler::zero, done);
         } else {
           assert(UseG1GC, "Should be");
           // Is marking still active?
           if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {