src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp

rev 50536 : [mq]: rename_on_root

@@ -31,11 +31,11 @@
 #define __ masm->
 
 void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                    Register val, Address dst, Register tmp) {
   bool on_heap = (decorators & IN_HEAP) != 0;
-  bool on_root = (decorators & IN_NATIVE) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
   bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
 
   switch (type) {
   case T_ARRAY:
   case T_OBJECT: {

@@ -55,11 +55,11 @@
         __ st(val, dst);
       } else {
         __ st_ptr(val, dst);
       }
     } else {
-      assert(on_root, "why else?");
+      assert(in_native, "why else?");
       __ st_ptr(val, dst);
     }
     break;
   }
   default: Unimplemented();

@@ -67,11 +67,11 @@
 }
 
 void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                   Address src, Register dst, Register tmp) {
   bool on_heap = (decorators & IN_HEAP) != 0;
-  bool on_root = (decorators & IN_NATIVE) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
   bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
 
   switch (type) {
   case T_ARRAY:
   case T_OBJECT: {

@@ -90,11 +90,11 @@
         }
       } else {
         __ ld_ptr(src, dst);
       }
     } else {
-      assert(on_root, "why else?");
+      assert(in_native, "why else?");
       __ ld_ptr(src, dst);
     }
     break;
   }
   default: Unimplemented();