--- old/src/hotspot/share/opto/arraycopynode.cpp	2018-03-16 09:52:27.694658124 +0100
+++ new/src/hotspot/share/opto/arraycopynode.cpp	2018-03-16 09:52:27.503649971 +0100
@@ -190,7 +190,7 @@
         ciType* field_klass = field->type();
         type = TypeOopPtr::make_from_klass(field_klass->as_klass());
       }
-      if (UseLoadBarrier) {
+      if (UseZGC) {
         if (can_reshape) {
           PhaseIterGVN* igvn = phase->is_IterGVN();
           igvn->_worklist.push(mem);
@@ -270,7 +270,7 @@
       return false;
     }
 
-    if (dest_elem == T_OBJECT && UseLoadBarrier) {
+    if (dest_elem == T_OBJECT && UseZGC) {
       return false;
     }
 
@@ -317,7 +317,7 @@
     BasicType elem = ary_src->klass()->as_array_klass()->element_type()->basic_type();
     if (elem == T_ARRAY)  elem = T_OBJECT;
 
-    if (elem == T_OBJECT && UseLoadBarrier) {
+    if (elem == T_OBJECT && UseZGC) {
       return false;
     }
 
@@ -376,7 +376,7 @@
                                         BasicType copy_type,
                                         const Type* value_type,
                                         int count) {
-  guarantee(!UseLoadBarrier || copy_type != T_OBJECT, "Must be");
+  guarantee(!UseZGC || copy_type != T_OBJECT, "Must be");
   Node* mem = phase->C->top();
   if (!forward_ctl->is_top()) {
     // copy forward
@@ -419,7 +419,7 @@
                                          BasicType copy_type,
                                          const Type* value_type,
                                          int count) {
-  guarantee(!UseLoadBarrier || copy_type != T_OBJECT, "Must be");
+  guarantee(!UseZGC || copy_type != T_OBJECT, "Must be");
   Node* mem = phase->C->top();
   if (!backward_ctl->is_top()) {
     // copy backward