--- old/src/hotspot/share/utilities/globalDefinitions.hpp	2018-12-03 14:35:54.394734346 +0100
+++ new/src/hotspot/share/utilities/globalDefinitions.hpp	2018-12-03 14:35:54.078737469 +0100
@@ -594,8 +594,7 @@
   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_CONFLICT    = 20, // for stack value type with conflicting contents
   T_ILLEGAL     = 99
 };
 
@@ -693,12 +692,7 @@
 #endif
   T_NARROWOOP_aelem_bytes   = 4,
   T_NARROWKLASS_aelem_bytes = 4,
-  T_VOID_aelem_bytes        = 0,
-#ifdef _LP64
-  T_VALUETYPEPTR_aelem_bytes= 8
-#else
-  T_VALUETYPEPTR_aelem_bytes= 4
-#endif
+  T_VOID_aelem_bytes        = 0
 };
 
 extern int _type2aelembytes[T_CONFLICT+1]; // maps a BasicType to nof bytes used by its array element