--- old/src/hotspot/share/oops/valueKlass.hpp	2019-05-15 13:57:20.739621490 -0400
+++ new/src/hotspot/share/oops/valueKlass.hpp	2019-05-15 13:57:20.367619646 -0400
@@ -137,8 +137,9 @@
   // Type testing
   bool is_value_slow() const        { return true; }
 
-  oop value_mirror() const { return java_lang_Class::value_mirror(java_mirror()); }
-  oop   box_mirror() const { return java_lang_Class::box_mirror(java_mirror()); }
+  // value_mirror is the primary mirror
+  oop value_mirror() const    { return java_lang_Class::inline_type_mirror(java_mirror()); }
+  oop nullable_mirror() const { return java_lang_Class::nullable_type_mirror(java_mirror()); }
 
   // Casting from Klass*
   static ValueKlass* cast(Klass* k) {
@@ -252,7 +253,7 @@
 
   void set_default_value(oop val) {
     java_mirror()->obj_field_put(default_value_offset(), val);
-    value_mirror()->obj_field_put(default_value_offset(), val);
+    nullable_mirror()->obj_field_put(default_value_offset(), val);
   }
 
   oop default_value() {