--- old/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp	2018-06-13 04:29:17.410166760 -0400
+++ new/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp	2018-06-13 04:29:17.098150373 -0400
@@ -33,7 +33,7 @@
 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) {
@@ -57,7 +57,7 @@
         __ st_ptr(val, dst);
       }
     } else {
-      assert(on_root, "why else?");
+      assert(in_native, "why else?");
       __ st_ptr(val, dst);
     }
     break;
@@ -69,7 +69,7 @@
 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) {
@@ -92,7 +92,7 @@
         __ ld_ptr(src, dst);
       }
     } else {
-      assert(on_root, "why else?");
+      assert(in_native, "why else?");
       __ ld_ptr(src, dst);
     }
     break;