src/hotspot/share/utilities/constantTag.cpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -55,16 +55,10 @@
     case JVM_CONSTANT_MethodHandleInError :
     case JVM_CONSTANT_MethodType :
     case JVM_CONSTANT_MethodTypeInError :
       return T_OBJECT;
 
-    case JVM_CONSTANT_Value :
-    case JVM_CONSTANT_ValueIndex :
-    case JVM_CONSTANT_UnresolvedValue :
-    case JVM_CONSTANT_UnresolvedValueInError :
-      return T_OBJECT; // Should this eventually be migrated to T_VALUETYPE?
-
     case JVM_CONSTANT_Dynamic :
     case JVM_CONSTANT_DynamicInError :
       assert(false, "Dynamic constant has no fixed basic type");
 
     default:

@@ -76,12 +70,10 @@
 
 jbyte constantTag::non_error_value() const {
   switch (_tag) {
   case JVM_CONSTANT_UnresolvedClassInError:
     return JVM_CONSTANT_UnresolvedClass;
-  case JVM_CONSTANT_UnresolvedValueInError:
-    return JVM_CONSTANT_UnresolvedValue;
   case JVM_CONSTANT_MethodHandleInError:
     return JVM_CONSTANT_MethodHandle;
   case JVM_CONSTANT_MethodTypeInError:
     return JVM_CONSTANT_MethodType;
   case JVM_CONSTANT_DynamicInError:

@@ -94,12 +86,10 @@
 
 jbyte constantTag::error_value() const {
   switch (_tag) {
   case JVM_CONSTANT_UnresolvedClass:
     return JVM_CONSTANT_UnresolvedClassInError;
-  case JVM_CONSTANT_UnresolvedValue:
-    return JVM_CONSTANT_UnresolvedValueInError;
   case JVM_CONSTANT_MethodHandle:
     return JVM_CONSTANT_MethodHandleInError;
   case JVM_CONSTANT_MethodType:
     return JVM_CONSTANT_MethodTypeInError;
   case JVM_CONSTANT_Dynamic:

@@ -156,16 +146,10 @@
       return "Unresolved Class Error";
     case JVM_CONSTANT_ClassIndex :
       return "Unresolved Class Index";
     case JVM_CONSTANT_StringIndex :
       return "Unresolved String Index";
-    case JVM_CONSTANT_Value :
-      return "Value Type";
-    case JVM_CONSTANT_UnresolvedValue :
-      return "Unresolved Value Type";
-    case JVM_CONSTANT_UnresolvedValueInError :
-      return "Unresolved Value Type Error";
     default:
       ShouldNotReachHere();
       return "Illegal";
   }
 }