src/share/vm/opto/compile.cpp

rev 10556 : [backport] Remove C2 write-barrier from .ad files

@@ -2332,11 +2332,11 @@
       assert(failing(), "must bail out w/ explicit message");
       return;
     }
   }
 
-  if (UseShenandoahGC && ShenandoahWriteBarrierToIR) {
+  if (UseShenandoahGC) {
     if (shenandoah_barriers_count() > 0) {
       C->clear_major_progress();
       PhaseIdealLoop ideal_loop(igvn, false, true);
       if (failing()) return;
       PhaseIdealLoop::verify(igvn);

@@ -3258,11 +3258,11 @@
     }
     break;
   case Op_ShenandoahReadBarrier:
     break;
   case Op_ShenandoahWriteBarrier:
-    assert(!ShenandoahWriteBarrierToIR, "should have been expanded already");
+    assert(false, "should have been expanded already");
     break;
   default:
     assert( !n->is_Call(), "" );
     assert( !n->is_Mem(), "" );
     assert( nop != Op_ProfileBoolean, "should be eliminated during IGVN");