src/hotspot/share/utilities/globalDefinitions.hpp

@@ -581,19 +581,19 @@
   T_SHORT       =  9,
   T_INT         = 10,
   T_LONG        = 11,
   T_OBJECT      = 12,
   T_ARRAY       = 13,
-  T_VALUETYPE   = 14,
-  T_VOID        = 15,
-  T_ADDRESS     = 16,
-  T_NARROWOOP   = 17,
-  T_METADATA    = 18,
-  T_NARROWKLASS = 19,
-  T_VALUETYPEPTR= 20, // the compiler needs a way to identify buffered values
-  T_CONFLICT    = 21, // for stack value type with conflicting contents
-  T_ILLEGAL     = 99
+  T_VOID        = 14,
+  T_ADDRESS     = 15,
+  T_NARROWOOP   = 16,
+  T_METADATA    = 17,
+  T_NARROWKLASS = 18,
+  T_VALUETYPEPTR= 19, // the compiler needs a way to identify buffered values
+  T_CONFLICT    = 20, // for stack value type with conflicting contents
+  T_ILLEGAL     = 99,
+  T_VALUETYPE   = 100  // temporary hack for the transition for VVT to LWVT
 };
 
 inline bool is_java_primitive(BasicType t) {
   return T_BOOLEAN <= t && t <= T_LONG;
 }

@@ -623,11 +623,10 @@
   case 'S': return T_SHORT;
   case 'Z': return T_BOOLEAN;
   case 'V': return T_VOID;
   case 'L': return T_OBJECT;
   case '[': return T_ARRAY;
-  case 'Q': return T_VALUETYPE;
   }
   return T_ILLEGAL;
 }
 
 extern char type2char_tab[T_CONFLICT+1];     // Map a BasicType to a jchar

@@ -678,15 +677,13 @@
   T_INT_aelem_bytes         = 4,
   T_LONG_aelem_bytes        = 8,
 #ifdef _LP64
   T_OBJECT_aelem_bytes      = 8,
   T_ARRAY_aelem_bytes       = 8,
-  T_VALUETYPE_aelem_bytes   = 8,
 #else
   T_OBJECT_aelem_bytes      = 4,
   T_ARRAY_aelem_bytes       = 4,
-  T_VALUETYPE_aelem_bytes   = 4,
 #endif
   T_NARROWOOP_aelem_bytes   = 4,
   T_NARROWKLASS_aelem_bytes = 4,
   T_VOID_aelem_bytes        = 0,
 #ifdef _LP64

@@ -784,14 +781,12 @@
   itos = 4,             // int tos cached
   ltos = 5,             // long tos cached
   ftos = 6,             // float tos cached
   dtos = 7,             // double tos cached
   atos = 8,             // object cached
-  qtos = 9,             // value type cached
-  vtos = 10,            // tos not cached,
+  vtos = 9,             // tos not cached,
   number_of_states,
-  ptos = 12,            // polymorphic tos cache (atos or qtos)
   ilgl                  // illegal state: should not occur
 };
 
 
 inline TosState as_TosState(BasicType type) {

@@ -802,12 +797,12 @@
     case T_SHORT  : return stos;
     case T_INT    : return itos;
     case T_LONG   : return ltos;
     case T_FLOAT  : return ftos;
     case T_DOUBLE : return dtos;
-    case T_VALUETYPE : return qtos;
     case T_VOID   : return vtos;
+    case T_VALUETYPE: // fall through
     case T_ARRAY  : // fall through
     case T_OBJECT : return atos;
     default       : return ilgl;
   }
 }

@@ -821,11 +816,10 @@
     case itos : return T_INT;
     case ltos : return T_LONG;
     case ftos : return T_FLOAT;
     case dtos : return T_DOUBLE;
     case atos : return T_OBJECT;
-    case qtos : return T_VALUETYPE;
     case vtos : return T_VOID;
     default   : return T_ILLEGAL;
   }
 }