src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java

*** 83,19 ***
       */
      static class Constants {
          Constants() { } // static only
  
          static final int
!             MN_IS_METHOD           = 0x00010000, // method (not constructor)
!             MN_IS_CONSTRUCTOR      = 0x00020000, // constructor
!             MN_IS_FIELD            = 0x00040000, // field
!             MN_IS_TYPE             = 0x00080000, // nested type
!             MN_CALLER_SENSITIVE    = 0x00100000, // @CallerSensitive annotation detected
!             MN_TRUSTED_FINAL       = 0x00200000, // trusted final field
!             MN_HIDDEN_MEMBER       = 0x00400000, // members defined in a hidden class or with @Hidden
!             MN_REFERENCE_KIND_SHIFT = 24, // refKind
!             MN_REFERENCE_KIND_MASK = 0x0F000000 >> MN_REFERENCE_KIND_SHIFT;
  
          /**
           * Constant pool reference-kind codes, as used by CONSTANT_MethodHandle CP entries.
           */
          static final byte
--- 83,22 ---
       */
      static class Constants {
          Constants() { } // static only
  
          static final int
!             MN_IS_METHOD             = 0x00010000, // method (not object constructor)
!             MN_IS_CONSTRUCTOR        = 0x00020000, // object constructor
!             MN_IS_FIELD              = 0x00040000, // field
!             MN_IS_TYPE               = 0x00080000, // nested type
!             MN_CALLER_SENSITIVE      = 0x00100000, // @CallerSensitive annotation detected
!             MN_TRUSTED_FINAL         = 0x00200000, // trusted final field
!             MN_HIDDEN_MEMBER         = 0x00400000, // members defined in a hidden class or with @Hidden
!             MN_NULL_RESTRICTED       = 0x00800000, // null-restricted field
!             MN_REFERENCE_KIND_SHIFT  = 24, // refKind
+             MN_REFERENCE_KIND_MASK   = 0x0F000000 >>> MN_REFERENCE_KIND_SHIFT, // 4 bits
+             MN_LAYOUT_SHIFT          = 28, // field layout
+             MN_LAYOUT_MASK           = 0x70000000 >>> MN_LAYOUT_SHIFT;  // 3 bits
  
          /**
           * Constant pool reference-kind codes, as used by CONSTANT_MethodHandle CP entries.
           */
          static final byte