--- old/src/hotspot/share/oops/cpCache.hpp	2018-02-15 15:33:23.000000000 -0500
+++ new/src/hotspot/share/oops/cpCache.hpp	2018-02-15 15:33:23.000000000 -0500
@@ -50,7 +50,7 @@
 // _indices   [ b2 | b1 |  index  ]  index = constant_pool_index
 // _f1        [  entry specific   ]  metadata ptr (method or klass)
 // _f2        [  entry specific   ]  vtable or res_ref index, or vfinal method ptr
-// _flags     [tos|0|F=1|0|0|i|f|v|0 |0000|field_index] (for field entries)
+// _flags     [tos|0|F=1|0|N|i|f|v|0 |0000|field_index] (for field entries)
 // bit length [ 4 |1| 1 |1|1|1|1|1|1 |1     |-3-|----16-----]
 // _flags     [tos|0|F=0|M|A|I|f|0|vf|indy_rf|000|00000|psize] (for method entries)
 // bit length [ 4 |1| 1 |1|1|1|1|1|1 |-4--|--8--|--8--]
@@ -76,6 +76,7 @@
 //
 // The flags after TosState have the following interpretation:
 // bit 27: 0 for fields, 1 for methods
+// N  flag true if field is marked flattenable (must never be null)
 // i  flag true if field is inlined (flatten)
 // f  flag true if field is marked final
 // v  flag true if field is volatile (only for fields)
@@ -94,8 +95,7 @@
 // ftos: 6
 // dtos: 7
 // atos: 8
-// qtos: 9
-// vtos: 10
+// vtos: 9
 //
 // Entry specific: field entries:
 // _indices = get (b1 section) and put (b2 section) bytecodes, original constant pool index
@@ -185,6 +185,7 @@
     is_field_entry_shift       = 26,  // (F) is it a field or a method?
     has_method_type_shift      = 25,  // (M) does the call site have a MethodType?
     has_appendix_shift         = 24,  // (A) does the call site have an appendix argument?
+    is_flattenable_field       = 24,  // (N) is the field flattenable (must never be null)
     is_forced_virtual_shift    = 23,  // (I) is the interface reference forced to virtual mode?
     is_flatten_field           = 23,  // (i) is the value field flatten?
     is_final_shift             = 22,  // (f) is the field or method final?
@@ -227,6 +228,7 @@
     bool            is_final,                    // the field is final
     bool            is_volatile,                 // the field is volatile
     bool            is_flatten,                  // the field is flatten (value field)
+    bool            is_flattenable,              // the field is flattenable (must never be null)
     Klass*          root_klass                   // needed by the GC to dirty the klass
   );
 
@@ -325,7 +327,7 @@
       case Bytecodes::_invokeinterface : return 1;
       case Bytecodes::_putstatic       :    // fall through
       case Bytecodes::_putfield        :    // fall through
-      case Bytecodes::_vwithfield      :    // fall through
+      case Bytecodes::_withfield       :    // fall through
       case Bytecodes::_invokevirtual   : return 2;
       default                          : break;
     }
@@ -375,7 +377,7 @@
   bool is_field_entry() const                    { return (_flags & (1 << is_field_entry_shift))    != 0; }
   bool is_long() const                           { return flag_state() == ltos; }
   bool is_double() const                         { return flag_state() == dtos; }
-  bool is_valuetype() const                      { return flag_state() == qtos; }
+  bool is_flattenable() const                    { return (_flags & (1 << is_flattenable_field))       != 0; }
   TosState flag_state() const                    { assert((uint)number_of_states <= (uint)tos_state_mask+1, "");
                                                    return (TosState)((_flags >> tos_state_shift) & tos_state_mask); }
   void set_indy_resolution_failed();