src/share/vm/opto/memnode.hpp

*** 202,211 ****
--- 202,222 ----
    static bool is_immutable_value(Node* adr);
  #endif
  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
+   // special case of RawPtr loads from TLS top & end, and other loads performed by
+   // GC barriers, the control edge carries the dependence preventing hoisting past
+   // a Safepoint instead of the memory edge.  (An unfortunate consequence of having
+   // Safepoints not set Raw Memory; itself an unfortunate consequence of having Nodes
+   // which produce results (new raw memory state) inside of loops preventing all
+   // manner of other optimizations).  Basically, it's ugly but so is the alternative.
+   // See comment in macro.cpp, around line 125 expand_allocate_common().
+   virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
+ 
  };
  
  //------------------------------LoadBNode--------------------------------------
  // Load a byte (8bits signed) from memory
  class LoadBNode : public LoadNode {
*** 368,387 ****
      : LoadNode(c,mem,adr,at,t) {}
    virtual int Opcode() const;
    virtual uint ideal_reg() const { return Op_RegP; }
    virtual int store_Opcode() const { return Op_StoreP; }
    virtual BasicType memory_type() const { return T_ADDRESS; }
-   // depends_only_on_test is almost always true, and needs to be almost always
-   // true to enable key hoisting & commoning optimizations.  However, for the
-   // special case of RawPtr loads from TLS top & end, the control edge carries
-   // the dependence preventing hoisting past a Safepoint instead of the memory
-   // edge.  (An unfortunate consequence of having Safepoints not set Raw
-   // Memory; itself an unfortunate consequence of having Nodes which produce
-   // results (new raw memory state) inside of loops preventing all manner of
-   // other optimizations).  Basically, it's ugly but so is the alternative.
-   // See comment in macro.cpp, around line 125 expand_allocate_common().
-   virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
  };
  
  
  //------------------------------LoadNNode--------------------------------------
  // Load a narrow oop from memory (either object or array)
--- 379,388 ----
*** 391,410 ****
      : LoadNode(c,mem,adr,at,t) {}
    virtual int Opcode() const;
    virtual uint ideal_reg() const { return Op_RegN; }
    virtual int store_Opcode() const { return Op_StoreN; }
    virtual BasicType memory_type() const { return T_NARROWOOP; }
-   // depends_only_on_test is almost always true, and needs to be almost always
-   // true to enable key hoisting & commoning optimizations.  However, for the
-   // special case of RawPtr loads from TLS top & end, the control edge carries
-   // the dependence preventing hoisting past a Safepoint instead of the memory
-   // edge.  (An unfortunate consequence of having Safepoints not set Raw
-   // Memory; itself an unfortunate consequence of having Nodes which produce
-   // results (new raw memory state) inside of loops preventing all manner of
-   // other optimizations).  Basically, it's ugly but so is the alternative.
-   // See comment in macro.cpp, around line 125 expand_allocate_common().
-   virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
  };
  
  //------------------------------LoadKlassNode----------------------------------
  // Load a Klass from an object
  class LoadKlassNode : public LoadPNode {
--- 392,401 ----