1.1 --- a/src/share/vm/utilities/constantTag.hpp Fri Feb 22 10:03:02 2013 +0100
1.2 +++ b/src/share/vm/utilities/constantTag.hpp Fri Feb 22 08:36:42 2013 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -43,8 +43,7 @@
1.11 JVM_CONSTANT_UnresolvedClassInError = 103, // Error tag due to resolution error
1.12 JVM_CONSTANT_MethodHandleInError = 104, // Error tag due to resolution error
1.13 JVM_CONSTANT_MethodTypeInError = 105, // Error tag due to resolution error
1.14 - JVM_CONSTANT_Object = 106, // Required for BoundMethodHandle arguments.
1.15 - JVM_CONSTANT_InternalMax = 106 // Last implementation tag
1.16 + JVM_CONSTANT_InternalMax = 105 // Last implementation tag
1.17 };
1.18
1.19
1.20 @@ -84,8 +83,6 @@
1.21 bool is_klass_index() const { return _tag == JVM_CONSTANT_ClassIndex; }
1.22 bool is_string_index() const { return _tag == JVM_CONSTANT_StringIndex; }
1.23
1.24 - bool is_object() const { return _tag == JVM_CONSTANT_Object; }
1.25 -
1.26 bool is_klass_reference() const { return is_klass_index() || is_unresolved_klass(); }
1.27 bool is_klass_or_reference() const{ return is_klass() || is_klass_reference(); }
1.28 bool is_field_or_method() const { return is_field() || is_method() || is_interface_method(); }
1.29 @@ -98,7 +95,7 @@
1.30 bool is_loadable_constant() const {
1.31 return ((_tag >= JVM_CONSTANT_Integer && _tag <= JVM_CONSTANT_String) ||
1.32 is_method_type() || is_method_handle() ||
1.33 - is_unresolved_klass() || is_object());
1.34 + is_unresolved_klass());
1.35 }
1.36
1.37 constantTag() {
