< prev index next >

src/hotspot/share/opto/arraycopynode.cpp

Print this page

        

@@ -188,11 +188,11 @@
         type = TypeInstPtr::BOTTOM;
       } else {
         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);
         }
         return NodeSentinel;

@@ -268,11 +268,11 @@
       // It's an object array copy but we can't emit the card marking
       // that is needed
       return false;
     }
 
-    if (dest_elem == T_OBJECT && UseLoadBarrier) {
+    if (dest_elem == T_OBJECT && UseZGC) {
       return false;
     }
 
     value_type = ary_src->elem();
 

@@ -315,11 +315,11 @@
 
     assert(phase->type(src->in(AddPNode::Offset))->is_intptr_t()->get_con() == phase->type(dest->in(AddPNode::Offset))->is_intptr_t()->get_con(), "same start offset?");
     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;
     }
 
     int diff = arrayOopDesc::base_offset_in_bytes(elem) - phase->type(src->in(AddPNode::Offset))->is_intptr_t()->get_con();
     assert(diff >= 0, "clone should not start after 1st array element");

@@ -374,11 +374,11 @@
                                         Node* adr_dest,
                                         Node* base_dest,
                                         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
     mem = start_mem_dest;
 

@@ -417,11 +417,11 @@
                                          Node* adr_dest,
                                          Node* base_dest,
                                          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
     mem = start_mem_dest;
 
< prev index next >