--- old/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp	2018-06-13 04:29:15.654074538 -0400
+++ new/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp	2018-06-13 04:29:15.342058145 -0400
@@ -34,9 +34,9 @@
                                    Register base, RegisterOrConstant ind_or_offs, Register val,
                                    Register tmp1, Register tmp2, Register tmp3, bool needs_frame) {
   bool on_heap  = (decorators & IN_HEAP) != 0;
-  bool on_root  = (decorators & IN_NATIVE) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
   bool not_null = (decorators & OOP_NOT_NULL) != 0;
-  assert(on_heap || on_root, "where?");
+  assert(on_heap || in_native, "where?");
   assert_different_registers(base, val, tmp1, tmp2, R0);
 
   switch (type) {
@@ -67,9 +67,9 @@
                                   Register base, RegisterOrConstant ind_or_offs, Register dst,
                                   Register tmp1, Register tmp2, bool needs_frame, Label *L_handle_null) {
   bool on_heap  = (decorators & IN_HEAP) != 0;
-  bool on_root  = (decorators & IN_NATIVE) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
   bool not_null = (decorators & OOP_NOT_NULL) != 0;
-  assert(on_heap || on_root, "where?");
+  assert(on_heap || in_native, "where?");
   assert_different_registers(ind_or_offs.register_or_noreg(), dst, R0);
 
   switch (type) {