src/hotspot/share/opto/shenandoahSupport.hpp

rev 50076 : Fold Partial GC into Traversal GC

@@ -137,19 +137,17 @@
 class ShenandoahReadBarrierNode : public ShenandoahBarrierNode {
 public:
   ShenandoahReadBarrierNode(Node* ctrl, Node* mem, Node* obj)
     : ShenandoahBarrierNode(ctrl, mem, obj, true) {
     assert(UseShenandoahGC && (ShenandoahReadBarrier || ShenandoahStoreValReadBarrier ||
-                               ShenandoahWriteBarrier || ShenandoahStoreValWriteBarrier ||
-                               ShenandoahAcmpBarrier),
+                               ShenandoahWriteBarrier || ShenandoahAcmpBarrier),
            "should be enabled");
   }
   ShenandoahReadBarrierNode(Node* ctrl, Node* mem, Node* obj, bool allow_fromspace)
     : ShenandoahBarrierNode(ctrl, mem, obj, allow_fromspace) {
     assert(UseShenandoahGC && (ShenandoahReadBarrier || ShenandoahStoreValReadBarrier ||
-                               ShenandoahWriteBarrier || ShenandoahStoreValWriteBarrier ||
-                               ShenandoahAcmpBarrier),
+                               ShenandoahWriteBarrier || ShenandoahAcmpBarrier),
            "should be enabled");
   }
 
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);

@@ -170,11 +168,11 @@
   static bool fix_mem_phis_helper(Node* c, Node* mem, Node* mem_ctrl, Node* rep_ctrl, int alias, VectorSet& controls, GrowableArray<Node*>& phis, PhaseIdealLoop* phase);
 
 public:
   ShenandoahWriteBarrierNode(Compile* C, Node* ctrl, Node* mem, Node* obj)
     : ShenandoahBarrierNode(ctrl, mem, obj, false) {
-    assert(UseShenandoahGC && (ShenandoahWriteBarrier || ShenandoahStoreValWriteBarrier), "should be enabled");
+    assert(UseShenandoahGC && ShenandoahWriteBarrier, "should be enabled");
     C->add_shenandoah_barrier(this);
   }
 
   virtual int Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);

@@ -239,11 +237,11 @@
 
 class ShenandoahWBMemProjNode : public ProjNode {
 public:
   enum {SWBMEMPROJCON = (uint)-3};
   ShenandoahWBMemProjNode(Node *src) : ProjNode( src, SWBMEMPROJCON) {
-    assert(UseShenandoahGC && (ShenandoahWriteBarrier || ShenandoahStoreValWriteBarrier), "should be enabled");
+    assert(UseShenandoahGC && ShenandoahWriteBarrier, "should be enabled");
     assert(src->Opcode() == Op_ShenandoahWriteBarrier || src->is_Mach(), "epxect wb");
   }
   virtual Node* Identity(PhaseGVN* phase);
 
   virtual int Opcode() const;