src/hotspot/share/utilities/globalDefinitions.cpp

*** 92,102 ****
      if (type2char((BasicType)i) != 0) {
        assert(char2type(type2char((BasicType)i)) == i, "proper inverses");
        num_type_chars++;
      }
    }
!   assert(num_type_chars == 12, "must have tested the right number of mappings");
    assert(char2type(0) == T_ILLEGAL, "correct illegality");
  
    {
      for (int i = T_BOOLEAN; i <= T_CONFLICT; i++) {
        BasicType vt = (BasicType)i;
--- 92,102 ----
      if (type2char((BasicType)i) != 0) {
        assert(char2type(type2char((BasicType)i)) == i, "proper inverses");
        num_type_chars++;
      }
    }
!   assert(num_type_chars == 11, "must have tested the right number of mappings");
    assert(char2type(0) == T_ILLEGAL, "correct illegality");
  
    {
      for (int i = T_BOOLEAN; i <= T_CONFLICT; i++) {
        BasicType vt = (BasicType)i;
*** 177,192 ****
      BytesPerHeapOop    = BytesPerWord;
      BitsPerHeapOop     = BitsPerWord;
    }
    _type2aelembytes[T_OBJECT] = heapOopSize;
    _type2aelembytes[T_ARRAY]  = heapOopSize;
-   _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,191 ----
      BytesPerHeapOop    = BytesPerWord;
      BitsPerHeapOop     = BitsPerWord;
    }
    _type2aelembytes[T_OBJECT] = heapOopSize;
    _type2aelembytes[T_ARRAY]  = 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', '[', '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",
*** 197,207 ****
    "short",
    "int",
    "long",
    "object",
    "array",
-   "valuetype",
    "void",
    "*address*",
    "*narrowoop*",
    "*metadata*",
    "*narrowklass*",
--- 196,205 ----
*** 218,228 ****
    }
    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,
--- 216,226 ----
    }
    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,
*** 235,245 ****
    T_SHORT,                 // T_SHORT    =  9,
    T_INT,                   // T_INT      = 10,
    T_LONG,                  // T_LONG     = 11,
    T_OBJECT,                // T_OBJECT   = 12,
    T_OBJECT,                // T_ARRAY    = 13,
-   T_VALUETYPE,             // T_VALUETYPE = 14
    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,
--- 233,242 ----
*** 261,271 ****
    T_INT,     // T_SHORT    =  9,
    T_INT,     // T_INT      = 10,
    T_LONG,    // T_LONG     = 11,
    T_OBJECT,  // T_OBJECT   = 12,
    T_OBJECT,  // T_ARRAY    = 13,
-   T_VALUETYPE, // T_VALUETYPE = 14
    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,
--- 258,267 ----
*** 287,297 ****
    T_SHORT_aelem_bytes,       // T_SHORT    =  9,
    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,
-   T_VALUETYPE_aelem_bytes,   // T_VALUETYPE = 14
    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,
--- 283,292 ----