src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp

rev 50536 : [mq]: rename_on_root

@@ -28,11 +28,11 @@
 #define __ masm->
 
 void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                   Register dst, Address src, Register tmp1, Register tmp2, Register tmp3) {
   bool on_heap = (decorators & IN_HEAP) != 0;
-  bool on_root = (decorators & IN_NATIVE) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
   switch (type) {
   case T_OBJECT:
   case T_ARRAY: {
     if (on_heap) {
 #ifdef AARCH64

@@ -43,11 +43,11 @@
 #endif // AARCH64
       {
         __ ldr(dst, src);
       }
     } else {
-      assert(on_root, "why else?");
+      assert(in_native, "why else?");
       __ ldr(dst, src);
     }
     break;
   }
   default: Unimplemented();

@@ -56,11 +56,11 @@
 }
 
 void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                    Address obj, Register val, Register tmp1, Register tmp2, Register tmp3, bool is_null) {
   bool on_heap = (decorators & IN_HEAP) != 0;
-  bool on_root = (decorators & IN_NATIVE) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
   switch (type) {
   case T_OBJECT:
   case T_ARRAY: {
     if (on_heap) {
 #ifdef AARCH64

@@ -74,11 +74,11 @@
 #endif // AARCH64
       {
         __ str(val, obj);
       }
     } else {
-      assert(on_root, "why else?");
+      assert(in_native, "why else?");
       __ str(val, obj);
     }
     break;
   }
   default: Unimplemented();