src/hotspot/share/utilities/globalDefinitions.cpp

*** 113,123 ****
        case T_METADATA:    // metadata pointer
        case T_NARROWOOP:   // compressed pointer
        case T_NARROWKLASS: // compressed klass pointer
        case T_CONFLICT:    // might as well support a bottom type
        case T_VOID:        // padding or other unaddressed word
-       case T_VALUETYPEPTR:
          // layout type must map to itself
          assert(vt == ft, "");
          break;
        default:
          // non-layout type must map to a (different) layout type
--- 113,122 ----
*** 178,188 ****
    _type2aelembytes[T_VALUETYPE]  = heapOopSize;
  }
  
  
  // Map BasicType to signature character
! char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'Q', 'V', 0, 0, 0, 0, 0, 0};
  
  // Map BasicType to Java type name
  const char* type2name_tab[T_CONFLICT+1] = {
    NULL, NULL, NULL, NULL,
    "boolean",
--- 177,187 ----
    _type2aelembytes[T_VALUETYPE]  = heapOopSize;
  }
  
  
  // Map BasicType to signature character
! char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'Q', 'V', 0, 0, 0, 0, 0};
  
  // Map BasicType to Java type name
  const char* type2name_tab[T_CONFLICT+1] = {
    NULL, NULL, NULL, NULL,
    "boolean",
*** 199,209 ****
    "void",
    "*address*",
    "*narrowoop*",
    "*metadata*",
    "*narrowklass*",
-   "valuetypeptr",
    "*conflict*"
  };
  
  
  BasicType name2type(const char* name) {
--- 198,207 ----
*** 214,224 ****
    }
    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, 1, 0, 1, 1, 1, 1, 1, -1};
  
  BasicType type2field[T_CONFLICT+1] = {
    (BasicType)0,            // 0,
    (BasicType)0,            // 1,
    (BasicType)0,            // 2,
--- 212,222 ----
    }
    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, 1, 0, 1, 1, 1, 1, -1};
  
  BasicType type2field[T_CONFLICT+1] = {
    (BasicType)0,            // 0,
    (BasicType)0,            // 1,
    (BasicType)0,            // 2,
*** 237,248 ****
    T_VOID,                  // T_VOID     = 15,
    T_ADDRESS,               // T_ADDRESS  = 16,
    T_NARROWOOP,             // T_NARROWOOP= 17,
    T_METADATA,              // T_METADATA = 18,
    T_NARROWKLASS,           // T_NARROWKLASS = 19,
!   T_VALUETYPEPTR,          // T_VALUETYPEPTR = 20,
!   T_CONFLICT               // T_CONFLICT = 21,
  };
  
  
  BasicType type2wfield[T_CONFLICT+1] = {
    (BasicType)0,            // 0,
--- 235,245 ----
    T_VOID,                  // T_VOID     = 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,
*** 263,274 ****
    T_VOID,    // T_VOID     = 15,
    T_ADDRESS, // T_ADDRESS  = 16,
    T_NARROWOOP, // T_NARROWOOP  = 17,
    T_METADATA,  // T_METADATA   = 18,
    T_NARROWKLASS, // T_NARROWKLASS  = 19,
!   T_VALUETYPEPTR,// T_VALUETYPEPTR = 20,
!   T_CONFLICT // T_CONFLICT = 21,
  };
  
  
  int _type2aelembytes[T_CONFLICT+1] = {
    0,                         // 0
--- 260,270 ----
    T_VOID,    // T_VOID     = 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
*** 289,300 ****
    0,                         // T_VOID     = 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,
!   T_VALUETYPEPTR_aelem_bytes,// T_VALUETYPEPTR = 20,
!   0                          // T_CONFLICT = 21,
  };
  
  #ifdef ASSERT
  int type2aelembytes(BasicType t, bool allow_address) {
    assert(allow_address || t != T_ADDRESS, " ");
--- 285,295 ----
    0,                         // T_VOID     = 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, " ");