comparison src/share/vm/utilities/constantTag.cpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 28ca974cc21a
children 78bbf4d43a14
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
49 case JVM_CONSTANT_UnresolvedClass : 49 case JVM_CONSTANT_UnresolvedClass :
50 case JVM_CONSTANT_UnresolvedClassInError : 50 case JVM_CONSTANT_UnresolvedClassInError :
51 case JVM_CONSTANT_ClassIndex : 51 case JVM_CONSTANT_ClassIndex :
52 case JVM_CONSTANT_StringIndex : 52 case JVM_CONSTANT_StringIndex :
53 case JVM_CONSTANT_MethodHandle : 53 case JVM_CONSTANT_MethodHandle :
54 case JVM_CONSTANT_MethodHandleInError :
54 case JVM_CONSTANT_MethodType : 55 case JVM_CONSTANT_MethodType :
56 case JVM_CONSTANT_MethodTypeInError :
55 return T_OBJECT; 57 return T_OBJECT;
56 default: 58 default:
57 ShouldNotReachHere(); 59 ShouldNotReachHere();
58 return T_ILLEGAL; 60 return T_ILLEGAL;
59 } 61 }
60 } 62 }
61 63
64
65 jbyte constantTag::non_error_value() const {
66 switch (_tag) {
67 case JVM_CONSTANT_UnresolvedClassInError:
68 return JVM_CONSTANT_UnresolvedClass;
69 case JVM_CONSTANT_MethodHandleInError:
70 return JVM_CONSTANT_MethodHandle;
71 case JVM_CONSTANT_MethodTypeInError:
72 return JVM_CONSTANT_MethodType;
73 default:
74 return _tag;
75 }
76 }
62 77
63 78
64 const char* constantTag::internal_name() const { 79 const char* constantTag::internal_name() const {
65 switch (_tag) { 80 switch (_tag) {
66 case JVM_CONSTANT_Invalid : 81 case JVM_CONSTANT_Invalid :