src/share/vm/opto/memnode.hpp

@@ -87,14 +87,10 @@
   static Node *optimize_simple_memory_chain(Node *mchain, const TypeOopPtr *t_oop, Node *load, PhaseGVN *phase);
   static Node *optimize_memory_chain(Node *mchain, const TypePtr *t_adr, Node *load, PhaseGVN *phase);
   // This one should probably be a phase-specific function:
   static bool all_controls_dominate(Node* dom, Node* sub);
 
-  // Find any cast-away of null-ness and keep its control.
-  static  Node *Ideal_common_DU_postCCP( PhaseCCP *ccp, Node* n, Node* adr );
-  virtual Node *Ideal_DU_postCCP( PhaseCCP *ccp );
-
   virtual const class TypePtr *adr_type() const;  // returns bottom_type of address
 
   // Shared code for Ideal methods:
   Node *Ideal_common(PhaseGVN *phase, bool can_reshape);  // Return -1 for short-circuit NULL.
 

@@ -109,10 +105,16 @@
 #else
     return 0;
 #endif
   }
 
+#ifdef ASSERT
+  void set_raw_adr_type(const TypePtr *t) {
+    _adr_type = t;
+  }
+#endif
+
   // Map a load or store opcode to its corresponding store opcode.
   // (Return -1 if unknown.)
   virtual int store_Opcode() const { return -1; }
 
   // What is the type of the value in memory?  (T_VOID mean "unspecified".)

@@ -256,10 +258,26 @@
 #endif
 #ifdef ASSERT
   // Helper function to allow a raw load without control edge for some cases
   static bool is_immutable_value(Node* adr);
 #endif
+
+  virtual bool is_g1_marking_load() const {
+    const int marking_offset = in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active());
+    return in(2)->is_AddP() && in(2)->in(2)->Opcode() == Op_ThreadLocal
+      && in(2)->in(3)->is_Con()
+      && in(2)->in(3)->bottom_type()->is_intptr_t()->get_con() == marking_offset;
+  }
+
+  virtual bool is_shenandoah_state_load() const {
+    if (!UseShenandoahGC) return false;
+    const int state_offset = in_bytes(JavaThread::gc_state_offset());
+    return in(2)->is_AddP() && in(2)->in(2)->Opcode() == Op_ThreadLocal
+      && in(2)->in(3)->is_Con()
+      && in(2)->in(3)->bottom_type()->is_intptr_t()->get_con() == state_offset;
+  }
+
 protected:
   const Type* load_array_final_field(const TypeKlassPtr *tkls,
                                      ciKlass* klass) const;
   // depends_only_on_test is almost always true, and needs to be almost always
   // true to enable key hoisting & commoning optimizations.  However, for the

@@ -789,10 +807,13 @@
   virtual uint match_edge(uint idx) const { return idx == MemNode::Address || idx == MemNode::ValueIn; }
 
   virtual const Type *bottom_type() const { return _type; }
   virtual uint ideal_reg() const;
   virtual const class TypePtr *adr_type() const { return _adr_type; }  // returns bottom_type of address
+  void set_adr_type(const TypePtr *t) {
+    _adr_type = t;
+  }
 
   bool result_not_used() const;
   MemBarNode* trailing_membar() const;
 };