src/share/vm/oops/cpCache.hpp

*** 47,57 ****
  // bit length |-8--|-8--|---16----|
  // --------------------------------
  // _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|0|f|v|0 |0000|field_index] (for field entries)
  // bit length [ 4 |1| 1 |1|1|1|1|1|1 |-4--|----16-----]
  // _flags     [tos|0|F=0|M|A|I|f|0|vf|0000|00000|psize] (for method entries)
  // bit length [ 4 |1| 1 |1|1|1|1|1|1 |-4--|--8--|--8--]
  
  // --------------------------------
--- 47,57 ----
  // bit length |-8--|-8--|---16----|
  // --------------------------------
  // _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)
  // bit length [ 4 |1| 1 |1|1|1|1|1|1 |-4--|----16-----]
  // _flags     [tos|0|F=0|M|A|I|f|0|vf|0000|00000|psize] (for method entries)
  // bit length [ 4 |1| 1 |1|1|1|1|1|1 |-4--|--8--|--8--]
  
  // --------------------------------
*** 72,81 ****
--- 72,82 ----
  // v      = field is volatile
  // vf     = virtual but final (method entries only: is_vfinal())
  //
  // The flags after TosState have the following interpretation:
  // bit 27: 0 for fields, 1 for methods
+ // 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)
  // f2 flag true if f2 contains an oop (e.g., virtual final method)
  // fv flag true if invokeinterface used for method in class Object
  //
*** 186,195 ****
--- 187,197 ----
      // misc. option bits; can be any bit position in [16..27]
      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_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?
      is_volatile_shift          = 21,  // (v) is the field volatile?
      is_vfinal_shift            = 20,  // (vf) did the call resolve to a final method?
      // low order bits give field index (for FieldInfo) or method parameter size:
      field_index_bits           = 16,
*** 224,233 ****
--- 226,236 ----
      int             orig_field_index,            // the original field index in the field holder
      int             field_offset,                // the field offset in words in the field holder
      TosState        field_type,                  // the (machine) field type
      bool            is_final,                    // the field is final
      bool            is_volatile,                 // the field is volatile
+     bool            is_flatten,                  // the field is flatten (value field)
      Klass*          root_klass                   // needed by the GC to dirty the klass
    );
  
   private:
    void set_direct_or_vtable_call(
*** 352,361 ****
--- 355,365 ----
    int       f2_as_offset() const                 { assert(is_field_entry(),  ""); return (int)_f2; }
    int  field_index() const                       { assert(is_field_entry(),  ""); return (_flags & field_index_mask); }
    int  parameter_size() const                    { assert(is_method_entry(), ""); return (_flags & parameter_size_mask); }
    bool is_volatile() const                       { return (_flags & (1 << is_volatile_shift))       != 0; }
    bool is_final() const                          { return (_flags & (1 << is_final_shift))          != 0; }
+   bool is_flatten() const                        { return (_flags & (1 << is_flatten_field))        != 0; }
    bool is_forced_virtual() const                 { return (_flags & (1 << is_forced_virtual_shift)) != 0; }
    bool is_vfinal() const                         { return (_flags & (1 << is_vfinal_shift))         != 0; }
    bool has_appendix() const                      { return (!is_f1_null()) && (_flags & (1 << has_appendix_shift))      != 0; }
    bool has_method_type() const                   { return (!is_f1_null()) && (_flags & (1 << has_method_type_shift))   != 0; }
    bool is_method_entry() const                   { return (_flags & (1 << is_field_entry_shift))    == 0; }