1.1 --- a/src/share/vm/opto/graphKit.hpp Tue May 06 09:17:57 2014 +0200
1.2 +++ b/src/share/vm/opto/graphKit.hpp Wed Jun 03 14:22:57 2015 +0200
1.3 @@ -516,21 +516,24 @@
1.4 // adapted the `do_put_xxx' and `do_get_xxx' procedures for the case
1.5 // of volatile fields.
1.6 Node* make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
1.7 - MemNode::MemOrd mo, bool require_atomic_access = false) {
1.8 + MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest,
1.9 + bool require_atomic_access = false) {
1.10 // This version computes alias_index from bottom_type
1.11 return make_load(ctl, adr, t, bt, adr->bottom_type()->is_ptr(),
1.12 - mo, require_atomic_access);
1.13 + mo, control_dependency, require_atomic_access);
1.14 }
1.15 Node* make_load(Node* ctl, Node* adr, const Type* t, BasicType bt, const TypePtr* adr_type,
1.16 - MemNode::MemOrd mo, bool require_atomic_access = false) {
1.17 + MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest,
1.18 + bool require_atomic_access = false) {
1.19 // This version computes alias_index from an address type
1.20 assert(adr_type != NULL, "use other make_load factory");
1.21 return make_load(ctl, adr, t, bt, C->get_alias_index(adr_type),
1.22 - mo, require_atomic_access);
1.23 + mo, control_dependency, require_atomic_access);
1.24 }
1.25 // This is the base version which is given an alias index.
1.26 Node* make_load(Node* ctl, Node* adr, const Type* t, BasicType bt, int adr_idx,
1.27 - MemNode::MemOrd mo, bool require_atomic_access = false);
1.28 + MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest,
1.29 + bool require_atomic_access = false);
1.30
1.31 // Create & transform a StoreNode and store the effect into the
1.32 // parser's memory state.
