src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp

rev 53157 : [mq]: remove-leftovers.patch

@@ -671,12 +671,11 @@
 
   if (t2 == TypePtr::NULL_PTR) {
     return _type;
   }
 
-  const Type* type = t2->is_oopptr()->cast_to_nonconst();
-  return type;
+  return t2;
 }
 
 uint ShenandoahBarrierNode::hash() const {
   return TypeNode::hash() + _allow_fromspace;
 }

@@ -2419,11 +2418,11 @@
 void ShenandoahWriteBarrierNode::call_wb_stub(Node*& ctrl, Node*& val, Node*& result_mem,
                                               Node* raw_mem, Node* wb_mem,
                                               int alias,
                                               PhaseIdealLoop* phase) {
   IdealLoopTree*loop = phase->get_loop(ctrl);
-  const TypePtr* obj_type = phase->igvn().type(val)->is_oopptr()->cast_to_nonconst();
+  const TypePtr* obj_type = phase->igvn().type(val)->is_oopptr();
 
   // The slow path stub consumes and produces raw memory in addition
   // to the existing memory edges
   Node* base = find_bottom_mem(ctrl, phase);
 

@@ -3146,11 +3145,11 @@
   }
   const Type* t = in(1)->bottom_type();
   if (t == TypePtr::NULL_PTR) {
     return t;
   }
-  return t->is_oopptr()->cast_to_nonconst();
+  return t;
 }
 
 const Type* ShenandoahEnqueueBarrierNode::Value(PhaseGVN* phase) const {
   if (in(1) == NULL) {
     return Type::TOP;

@@ -3160,11 +3159,11 @@
     return Type::TOP;
   }
   if (t == TypePtr::NULL_PTR) {
     return t;
   }
-  return t->is_oopptr()->cast_to_nonconst();
+  return t;
 }
 
 int ShenandoahEnqueueBarrierNode::needed(Node* n) {
   if (n == NULL ||
       n->is_Allocate() ||