src/hotspot/share/utilities/globalDefinitions.cpp

*** 208,12 ***
    JVM_SIGNATURE_BOOLEAN, JVM_SIGNATURE_CHAR,
    JVM_SIGNATURE_FLOAT,   JVM_SIGNATURE_DOUBLE,
    JVM_SIGNATURE_BYTE,    JVM_SIGNATURE_SHORT,
    JVM_SIGNATURE_INT,     JVM_SIGNATURE_LONG,
    JVM_SIGNATURE_CLASS,   JVM_SIGNATURE_ARRAY,
!   JVM_SIGNATURE_VOID,    0,
!   0, 0, 0, 0
  };
  
  // Map BasicType to Java type name
  const char* type2name_tab[T_CONFLICT+1] = {
    nullptr, nullptr, nullptr, nullptr,
--- 208,12 ---
    JVM_SIGNATURE_BOOLEAN, JVM_SIGNATURE_CHAR,
    JVM_SIGNATURE_FLOAT,   JVM_SIGNATURE_DOUBLE,
    JVM_SIGNATURE_BYTE,    JVM_SIGNATURE_SHORT,
    JVM_SIGNATURE_INT,     JVM_SIGNATURE_LONG,
    JVM_SIGNATURE_CLASS,   JVM_SIGNATURE_ARRAY,
!   JVM_SIGNATURE_VOID,
!   0, 0, 0, 0, 0, 0
  };
  
  // Map BasicType to Java type name
  const char* type2name_tab[T_CONFLICT+1] = {
    nullptr, nullptr, nullptr, nullptr,

*** 226,10 ***
--- 226,11 ---
    "int",
    "long",
    "object",
    "array",
    "void",
+   "flat element",
    "*address*",
    "*narrowoop*",
    "*metadata*",
    "*narrowklass*",
    "*conflict*"

*** 255,11 ***
    }
    return T_ILLEGAL;
  }
  
  // Map BasicType to size in words
! int type2size[T_CONFLICT+1]={ -1, 0, 0, 0, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 0, 1, 1, 1, 1, -1};
  
  BasicType type2field[T_CONFLICT+1] = {
    (BasicType)0,            // 0,
    (BasicType)0,            // 1,
    (BasicType)0,            // 2,
--- 256,11 ---
    }
    return T_ILLEGAL;
  }
  
  // Map BasicType to size in words
! int type2size[T_CONFLICT+1]={ -1, 0, 0, 0, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 0, -1, 1, 1, 1, 1, -1};
  
  BasicType type2field[T_CONFLICT+1] = {
    (BasicType)0,            // 0,
    (BasicType)0,            // 1,
    (BasicType)0,            // 2,

*** 273,15 ***
    T_INT,                   // T_INT      = 10,
    T_LONG,                  // T_LONG     = 11,
    T_OBJECT,                // T_OBJECT   = 12,
    T_OBJECT,                // T_ARRAY    = 13,
    T_VOID,                  // T_VOID     = 14,
!   T_ADDRESS,               // T_ADDRESS  = 15,
!   T_NARROWOOP,             // T_NARROWOOP= 16,
!   T_METADATA,              // T_METADATA = 17,
!   T_NARROWKLASS,           // T_NARROWKLASS = 18,
!   T_CONFLICT               // T_CONFLICT = 19,
  };
  
  
  BasicType type2wfield[T_CONFLICT+1] = {
    (BasicType)0,            // 0,
--- 274,16 ---
    T_INT,                   // T_INT      = 10,
    T_LONG,                  // T_LONG     = 11,
    T_OBJECT,                // T_OBJECT   = 12,
    T_OBJECT,                // T_ARRAY    = 13,
    T_VOID,                  // T_VOID     = 14,
!   (BasicType)0,            // T_FLAT_ELEMENT = 15,
!   T_ADDRESS,               // T_ADDRESS  = 16,
!   T_NARROWOOP,             // T_NARROWOOP= 17,
!   T_METADATA,              // T_METADATA = 18,
!   T_NARROWKLASS,           // T_NARROWKLASS = 19,
+   T_CONFLICT               // T_CONFLICT = 20
  };
  
  
  BasicType type2wfield[T_CONFLICT+1] = {
    (BasicType)0,            // 0,

*** 297,15 ***
    T_INT,     // T_INT      = 10,
    T_LONG,    // T_LONG     = 11,
    T_OBJECT,  // T_OBJECT   = 12,
    T_OBJECT,  // T_ARRAY    = 13,
    T_VOID,    // T_VOID     = 14,
!   T_ADDRESS, // T_ADDRESS  = 15,
!   T_NARROWOOP, // T_NARROWOOP  = 16,
!   T_METADATA,  // T_METADATA   = 17,
!   T_NARROWKLASS, // T_NARROWKLASS  = 18,
!   T_CONFLICT // T_CONFLICT = 19,
  };
  
  
  int _type2aelembytes[T_CONFLICT+1] = {
    0,                         // 0
--- 299,16 ---
    T_INT,     // T_INT      = 10,
    T_LONG,    // T_LONG     = 11,
    T_OBJECT,  // T_OBJECT   = 12,
    T_OBJECT,  // T_ARRAY    = 13,
    T_VOID,    // T_VOID     = 14,
!   (BasicType)0,  // T_FLAT_ELEMENT = 15,
!   T_ADDRESS, // T_ADDRESS  = 16,
!   T_NARROWOOP, // T_NARROWOOP  = 17,
!   T_METADATA,  // T_METADATA   = 18,
!   T_NARROWKLASS, // T_NARROWKLASS  = 19,
+   T_CONFLICT // T_CONFLICT = 20
  };
  
  
  int _type2aelembytes[T_CONFLICT+1] = {
    0,                         // 0

*** 321,15 ***
    T_INT_aelem_bytes,         // T_INT      = 10,
    T_LONG_aelem_bytes,        // T_LONG     = 11,
    T_OBJECT_aelem_bytes,      // T_OBJECT   = 12,
    T_ARRAY_aelem_bytes,       // T_ARRAY    = 13,
    0,                         // T_VOID     = 14,
!   T_OBJECT_aelem_bytes,      // T_ADDRESS  = 15,
!   T_NARROWOOP_aelem_bytes,   // T_NARROWOOP= 16,
!   T_OBJECT_aelem_bytes,      // T_METADATA = 17,
!   T_NARROWKLASS_aelem_bytes, // T_NARROWKLASS= 18,
!   0                          // T_CONFLICT = 19,
  };
  
  #ifdef ASSERT
  int type2aelembytes(BasicType t, bool allow_address) {
    assert((allow_address || t != T_ADDRESS) && t <= T_CONFLICT, "unexpected basic type");
--- 324,16 ---
    T_INT_aelem_bytes,         // T_INT      = 10,
    T_LONG_aelem_bytes,        // T_LONG     = 11,
    T_OBJECT_aelem_bytes,      // T_OBJECT   = 12,
    T_ARRAY_aelem_bytes,       // T_ARRAY    = 13,
    0,                         // T_VOID     = 14,
!   0,                         // T_FLAT_ELEMENT = 15,
!   T_OBJECT_aelem_bytes,      // T_ADDRESS  = 16,
!   T_NARROWOOP_aelem_bytes,   // T_NARROWOOP= 17,
!   T_OBJECT_aelem_bytes,      // T_METADATA = 18,
!   T_NARROWKLASS_aelem_bytes, // T_NARROWKLASS= 19,
+   0                          // T_CONFLICT = 20
  };
  
  #ifdef ASSERT
  int type2aelembytes(BasicType t, bool allow_address) {
    assert((allow_address || t != T_ADDRESS) && t <= T_CONFLICT, "unexpected basic type");