*** old/src/share/vm/opto/memnode.hpp	Tue Nov 10 15:17:19 2015
--- new/src/share/vm/opto/memnode.hpp	Tue Nov 10 15:17:19 2015

*** 198,208 ****
--- 198,209 ----
    }
  
    // Polymorphic factory method:
    static Node* make(PhaseGVN& gvn, Node *c, Node *mem, Node *adr,
                      const TypePtr* at, const Type *rt, BasicType bt,
                       MemOrd mo, ControlDependency control_dependency = DependsOnlyOnTest);
+                     MemOrd mo, ControlDependency control_dependency = DependsOnlyOnTest,
+                     bool unaligned = false, bool mismatched = false);
  
    virtual uint hash()   const;  // Check the type
  
    // Handle algebraic identities here.  If we have an identity, return the Node
    // we are equivalent to.  We look for Load of a Store.

*** 373,383 ****
--- 374,385 ----
    virtual uint ideal_reg() const { return Op_RegL; }
    virtual int store_Opcode() const { return Op_StoreL; }
    virtual BasicType memory_type() const { return T_LONG; }
    bool require_atomic_access() const { return _require_atomic_access; }
    static LoadLNode* make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type,
!                                 const Type* rt, MemOrd mo, ControlDependency control_dependency = DependsOnlyOnTest);
!                                 const Type* rt, MemOrd mo, ControlDependency control_dependency = DependsOnlyOnTest,
+                                 bool unaligned = false, bool mismatched = false);
  #ifndef PRODUCT
    virtual void dump_spec(outputStream *st) const {
      LoadNode::dump_spec(st);
      if (_require_atomic_access)  st->print(" Atomic!");
    }

*** 424,434 ****
--- 426,437 ----
    virtual uint ideal_reg() const { return Op_RegD; }
    virtual int store_Opcode() const { return Op_StoreD; }
    virtual BasicType memory_type() const { return T_DOUBLE; }
    bool require_atomic_access() const { return _require_atomic_access; }
    static LoadDNode* make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type,
!                                 const Type* rt, MemOrd mo, ControlDependency control_dependency = DependsOnlyOnTest);
!                                 const Type* rt, MemOrd mo, ControlDependency control_dependency = DependsOnlyOnTest,
+                                 bool unaligned = false, bool mismatched = false);
  #ifndef PRODUCT
    virtual void dump_spec(outputStream *st) const {
      LoadNode::dump_spec(st);
      if (_require_atomic_access)  st->print(" Atomic!");
    }