src/hotspot/share/utilities/constantTag.cpp

*** 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.

*** 33,11 ***
  }
  
  #endif // PRODUCT
  
  BasicType constantTag::basic_type() const {
!   switch (_tag) {
      case JVM_CONSTANT_Integer :
        return T_INT;
      case JVM_CONSTANT_Float :
        return T_FLOAT;
      case JVM_CONSTANT_Long :
--- 33,11 ---
  }
  
  #endif // PRODUCT
  
  BasicType constantTag::basic_type() const {
!   switch (value()) {
      case JVM_CONSTANT_Integer :
        return T_INT;
      case JVM_CONSTANT_Float :
        return T_FLOAT;
      case JVM_CONSTANT_Long :

*** 67,27 ***
    }
  }
  
  
  jbyte constantTag::non_error_value() const {
!   switch (_tag) {
    case JVM_CONSTANT_UnresolvedClassInError:
      return JVM_CONSTANT_UnresolvedClass;
    case JVM_CONSTANT_MethodHandleInError:
      return JVM_CONSTANT_MethodHandle;
    case JVM_CONSTANT_MethodTypeInError:
      return JVM_CONSTANT_MethodType;
    case JVM_CONSTANT_DynamicInError:
      return JVM_CONSTANT_Dynamic;
    default:
!     return _tag;
    }
  }
  
  
  jbyte constantTag::error_value() const {
!   switch (_tag) {
    case JVM_CONSTANT_UnresolvedClass:
      return JVM_CONSTANT_UnresolvedClassInError;
    case JVM_CONSTANT_MethodHandle:
      return JVM_CONSTANT_MethodHandleInError;
    case JVM_CONSTANT_MethodType:
--- 67,27 ---
    }
  }
  
  
  jbyte constantTag::non_error_value() const {
!   switch (value()) {
    case JVM_CONSTANT_UnresolvedClassInError:
      return JVM_CONSTANT_UnresolvedClass;
    case JVM_CONSTANT_MethodHandleInError:
      return JVM_CONSTANT_MethodHandle;
    case JVM_CONSTANT_MethodTypeInError:
      return JVM_CONSTANT_MethodType;
    case JVM_CONSTANT_DynamicInError:
      return JVM_CONSTANT_Dynamic;
    default:
!     return value();
    }
  }
  
  
  jbyte constantTag::error_value() const {
!   switch (value()) {
    case JVM_CONSTANT_UnresolvedClass:
      return JVM_CONSTANT_UnresolvedClassInError;
    case JVM_CONSTANT_MethodHandle:
      return JVM_CONSTANT_MethodHandleInError;
    case JVM_CONSTANT_MethodType:

*** 99,11 ***
      return JVM_CONSTANT_Invalid;
    }
  }
  
  const char* constantTag::internal_name() const {
!   switch (_tag) {
      case JVM_CONSTANT_Invalid :
        return "Invalid index";
      case JVM_CONSTANT_Class :
        return "Class";
      case JVM_CONSTANT_Fieldref :
--- 99,11 ---
      return JVM_CONSTANT_Invalid;
    }
  }
  
  const char* constantTag::internal_name() const {
!   switch (value()) {
      case JVM_CONSTANT_Invalid :
        return "Invalid index";
      case JVM_CONSTANT_Class :
        return "Class";
      case JVM_CONSTANT_Fieldref :