--- old/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp	2019-03-11 14:25:49.826355381 +0100
+++ new/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp	2019-03-11 14:25:49.626355384 +0100
@@ -207,7 +207,7 @@
     if (pre_val->bottom_type() == TypePtr::NULL_PTR) return;
     assert(pre_val->bottom_type()->basic_type() == T_OBJECT, "or we shouldn't be here");
   }
-  assert(bt == T_OBJECT, "or we shouldn't be here");
+  assert(bt == T_OBJECT || bt == T_VALUETYPE, "or we shouldn't be here");
 
   IdealKit ideal(kit, true);