src/hotspot/share/opto/graphKit.cpp

@@ -1696,11 +1696,11 @@
   }
   return store_oop(ctl, obj, adr, adr_type, val, val_type, bt, true, mo, mismatched);
 }
 
 Node* GraphKit::load_barrier(Node* val, Node* adr, bool weak, bool writeback, bool oop_reload_allowed) {
-  assert(UseLoadBarrier, "invariant");
+  assert(UseZGC, "invariant");
   Node* barrier = new LoadBarrierNode(C, control(), memory(TypeRawPtr::BOTTOM), val, adr, weak, writeback, oop_reload_allowed);
   Node* transformed_barrier = _gvn.transform(barrier);
 
   if (transformed_barrier->is_LoadBarrier()) {
     if (barrier == transformed_barrier) {

@@ -4413,11 +4413,11 @@
                                                   ciTypeArrayKlass::make(T_BYTE), true, 0);
   int value_field_idx = C->get_alias_index(value_field_type);
   Node* adr = basic_plus_adr(str, str, value_offset);
   Node* load = make_load(ctrl, adr,
                          value_type, T_OBJECT, value_field_idx, MemNode::unordered);
-  if (UseLoadBarrier) {
+  if (UseZGC) {
     load = load_barrier(load, adr);
   }
 
   // String.value field is known to be @Stable.
   if (UseImplicitStableValues) {