src/hotspot/share/gc/z/zBarrierSet.inline.hpp

@@ -60,18 +60,20 @@
     if (HasDecorator<decorators, ON_STRONG_OOP_REF>::value) {
       return ZBarrier::weak_load_barrier_on_oop_field_preloaded(addr, o);
     } else if (HasDecorator<decorators, ON_WEAK_OOP_REF>::value) {
       return ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(addr, o);
     } else {
+      assert((HasDecorator<decorators, ON_PHANTOM_OOP_REF>::value), "Must be");
       return ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(addr, o);
     }
   } else {
     if (HasDecorator<decorators, ON_STRONG_OOP_REF>::value) {
       return ZBarrier::load_barrier_on_oop_field_preloaded(addr, o);
     } else if (HasDecorator<decorators, ON_WEAK_OOP_REF>::value) {
       return ZBarrier::load_barrier_on_weak_oop_field_preloaded(addr, o);
     } else {
+      assert((HasDecorator<decorators, ON_PHANTOM_OOP_REF>::value), "Must be");
       return ZBarrier::load_barrier_on_phantom_oop_field_preloaded(addr, o);
     }
   }
 }
 

@@ -87,18 +89,20 @@
     if (decorators_known_strength & ON_STRONG_OOP_REF) {
       return ZBarrier::weak_load_barrier_on_oop_field_preloaded(addr, o);
     } else if (decorators_known_strength & ON_WEAK_OOP_REF) {
       return ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(addr, o);
     } else {
+      assert(decorators_known_strength & ON_PHANTOM_OOP_REF, "Must be");
       return ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(addr, o);
     }
   } else {
     if (decorators_known_strength & ON_STRONG_OOP_REF) {
       return ZBarrier::load_barrier_on_oop_field_preloaded(addr, o);
     } else if (decorators_known_strength & ON_WEAK_OOP_REF) {
       return ZBarrier::load_barrier_on_weak_oop_field_preloaded(addr, o);
     } else {
+      assert(decorators_known_strength & ON_PHANTOM_OOP_REF, "Must be");
       return ZBarrier::load_barrier_on_phantom_oop_field_preloaded(addr, o);
     }
   }
 }