src/hotspot/share/utilities/constantTag.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2017, 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.
--- 1,7 ----
  /*
!  * 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.
*** 42,65 ****
    JVM_CONSTANT_StringIndex              = 102,  // Temporary tag while constructing constant pool, class redefinition
    JVM_CONSTANT_UnresolvedClassInError   = 103,  // Error tag due to resolution error
    JVM_CONSTANT_MethodHandleInError      = 104,  // Error tag due to resolution error
    JVM_CONSTANT_MethodTypeInError        = 105,  // Error tag due to resolution error
    JVM_CONSTANT_DynamicInError           = 106,  // Error tag due to resolution error
!   JVM_CONSTANT_Value                    = 107,  // Internal derived value type
!   JVM_CONSTANT_ValueIndex               = 108,  // Temporary tag while construction constant pool, class redefinition
!   JVM_CONSTANT_UnresolvedValue          = 109,  // Temporary tag until actual use of derived value type
!   JVM_CONSTANT_UnresolvedValueInError   = 110,  // Error tag due to resolution error
!   JVM_CONSTANT_InternalMax              = 110   // Last implementation tag
  };
  
  
  class constantTag VALUE_OBJ_CLASS_SPEC {
   private:
    jbyte _tag;
   public:
    bool is_klass() const             { return _tag == JVM_CONSTANT_Class; }
-   bool is_value_type() const        { return _tag == JVM_CONSTANT_Value; }
    bool is_field () const            { return _tag == JVM_CONSTANT_Fieldref; }
    bool is_method() const            { return _tag == JVM_CONSTANT_Methodref; }
    bool is_interface_method() const  { return _tag == JVM_CONSTANT_InterfaceMethodref; }
    bool is_string() const            { return _tag == JVM_CONSTANT_String; }
    bool is_int() const               { return _tag == JVM_CONSTANT_Integer; }
--- 42,60 ----
    JVM_CONSTANT_StringIndex              = 102,  // Temporary tag while constructing constant pool, class redefinition
    JVM_CONSTANT_UnresolvedClassInError   = 103,  // Error tag due to resolution error
    JVM_CONSTANT_MethodHandleInError      = 104,  // Error tag due to resolution error
    JVM_CONSTANT_MethodTypeInError        = 105,  // Error tag due to resolution error
    JVM_CONSTANT_DynamicInError           = 106,  // Error tag due to resolution error
!   JVM_CONSTANT_InternalMax              = 106   // Last implementation tag
  };
  
  
  class constantTag VALUE_OBJ_CLASS_SPEC {
   private:
    jbyte _tag;
   public:
    bool is_klass() const             { return _tag == JVM_CONSTANT_Class; }
    bool is_field () const            { return _tag == JVM_CONSTANT_Fieldref; }
    bool is_method() const            { return _tag == JVM_CONSTANT_Methodref; }
    bool is_interface_method() const  { return _tag == JVM_CONSTANT_InterfaceMethodref; }
    bool is_string() const            { return _tag == JVM_CONSTANT_String; }
    bool is_int() const               { return _tag == JVM_CONSTANT_Integer; }
*** 77,94 ****
  
    bool is_unresolved_klass_in_error() const {
      return _tag == JVM_CONSTANT_UnresolvedClassInError;
    }
  
-   bool is_unresolved_value_type() const {
-     return _tag == JVM_CONSTANT_UnresolvedValue || _tag == JVM_CONSTANT_UnresolvedValueInError;
-   }
- 
-   bool is_unresolved_value_type_in_error() const {
-     return _tag == JVM_CONSTANT_UnresolvedValueInError;
-   }
- 
    bool is_method_handle_in_error() const {
      return _tag == JVM_CONSTANT_MethodHandleInError;
    }
    bool is_method_type_in_error() const {
      return _tag == JVM_CONSTANT_MethodTypeInError;
--- 72,81 ----
*** 97,116 ****
    bool is_dynamic_constant_in_error() const {
      return _tag == JVM_CONSTANT_DynamicInError;
    }
  
    bool is_klass_index() const       { return _tag == JVM_CONSTANT_ClassIndex; }
-   bool is_value_type_index() const  { return _tag == JVM_CONSTANT_ValueIndex; }
    bool is_string_index() const      { return _tag == JVM_CONSTANT_StringIndex; }
  
    bool is_klass_reference() const   { return is_klass_index() || is_unresolved_klass(); }
    bool is_klass_or_reference() const{ return is_klass() || is_klass_reference(); }
    bool is_field_or_method() const   { return is_field() || is_method() || is_interface_method(); }
    bool is_symbol() const            { return is_utf8(); }
  
-   bool is_value_type_or_reference() const { return is_value_type_index() || is_value_type() || is_unresolved_value_type(); }
- 
    bool is_method_type() const       { return _tag == JVM_CONSTANT_MethodType; }
    bool is_method_handle() const     { return _tag == JVM_CONSTANT_MethodHandle; }
    bool is_dynamic_constant() const  { return _tag == JVM_CONSTANT_Dynamic; }
    bool is_invoke_dynamic() const    { return _tag == JVM_CONSTANT_InvokeDynamic; }
  
--- 84,100 ----