src/share/vm/classfile/classFileParser.cpp

*** 1018,1030 ****
    NONSTATIC_DOUBLE,    // T_LONG     = 11,
    NONSTATIC_OOP,       // T_OBJECT   = 12,
    NONSTATIC_OOP,       // T_ARRAY    = 13,
    BAD_ALLOCATION_TYPE, // T_VOID     = 14,
    BAD_ALLOCATION_TYPE, // T_ADDRESS  = 15,
!   BAD_ALLOCATION_TYPE, // T_NARROWOOP= 16,
    BAD_ALLOCATION_TYPE, // T_METADATA = 17,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT = 18,
    BAD_ALLOCATION_TYPE, // 0
    BAD_ALLOCATION_TYPE, // 1
    BAD_ALLOCATION_TYPE, // 2
    BAD_ALLOCATION_TYPE, // 3
    STATIC_BYTE ,        // T_BOOLEAN  =  4,
--- 1018,1031 ----
    NONSTATIC_DOUBLE,    // T_LONG        = 11,
    NONSTATIC_OOP,       // T_OBJECT      = 12,
    NONSTATIC_OOP,       // T_ARRAY       = 13,
    BAD_ALLOCATION_TYPE, // T_VOID        = 14,
    BAD_ALLOCATION_TYPE, // T_ADDRESS     = 15,
!   BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 16,
    BAD_ALLOCATION_TYPE, // T_METADATA    = 17,
!   BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT    = 19,
    BAD_ALLOCATION_TYPE, // 0
    BAD_ALLOCATION_TYPE, // 1
    BAD_ALLOCATION_TYPE, // 2
    BAD_ALLOCATION_TYPE, // 3
    STATIC_BYTE ,        // T_BOOLEAN     =  4,
*** 1037,1049 ****
    STATIC_DOUBLE,       // T_LONG     = 11,
    STATIC_OOP,          // T_OBJECT   = 12,
    STATIC_OOP,          // T_ARRAY    = 13,
    BAD_ALLOCATION_TYPE, // T_VOID     = 14,
    BAD_ALLOCATION_TYPE, // T_ADDRESS  = 15,
!   BAD_ALLOCATION_TYPE, // T_NARROWOOP= 16,
    BAD_ALLOCATION_TYPE, // T_METADATA = 17,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT = 18,
  };
  
  static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
    assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
    FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
--- 1038,1051 ----
    STATIC_DOUBLE,       // T_LONG        = 11,
    STATIC_OOP,          // T_OBJECT      = 12,
    STATIC_OOP,          // T_ARRAY       = 13,
    BAD_ALLOCATION_TYPE, // T_VOID        = 14,
    BAD_ALLOCATION_TYPE, // T_ADDRESS     = 15,
!   BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 16,
    BAD_ALLOCATION_TYPE, // T_METADATA    = 17,
!   BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
!   BAD_ALLOCATION_TYPE, // T_CONFLICT    = 19,
  };
  
  static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
    assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
    FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];