1.1 --- a/src/share/vm/oops/constantPool.cpp Sun Sep 22 18:07:43 2013 +0200
1.2 +++ b/src/share/vm/oops/constantPool.cpp Mon Sep 23 08:56:19 2013 -0700
1.3 @@ -1611,9 +1611,11 @@
1.4 case JVM_CONSTANT_UnresolvedClassInError:
1.5 case JVM_CONSTANT_StringIndex:
1.6 case JVM_CONSTANT_MethodType:
1.7 + case JVM_CONSTANT_MethodTypeInError:
1.8 return 3;
1.9
1.10 case JVM_CONSTANT_MethodHandle:
1.11 + case JVM_CONSTANT_MethodHandleInError:
1.12 return 4; //tag, ref_kind, ref_index
1.13
1.14 case JVM_CONSTANT_Integer:
1.15 @@ -1794,8 +1796,8 @@
1.16 case JVM_CONSTANT_MethodHandle:
1.17 case JVM_CONSTANT_MethodHandleInError: {
1.18 *bytes = JVM_CONSTANT_MethodHandle;
1.19 - int kind = method_handle_ref_kind_at(idx);
1.20 - idx1 = method_handle_index_at(idx);
1.21 + int kind = method_handle_ref_kind_at_error_ok(idx);
1.22 + idx1 = method_handle_index_at_error_ok(idx);
1.23 *(bytes+1) = (unsigned char) kind;
1.24 Bytes::put_Java_u2((address) (bytes+2), idx1);
1.25 DBG(printf("JVM_CONSTANT_MethodHandle: %d %hd", kind, idx1));
1.26 @@ -1804,7 +1806,7 @@
1.27 case JVM_CONSTANT_MethodType:
1.28 case JVM_CONSTANT_MethodTypeInError: {
1.29 *bytes = JVM_CONSTANT_MethodType;
1.30 - idx1 = method_type_index_at(idx);
1.31 + idx1 = method_type_index_at_error_ok(idx);
1.32 Bytes::put_Java_u2((address) (bytes+1), idx1);
1.33 DBG(printf("JVM_CONSTANT_MethodType: %hd", idx1));
1.34 break;
1.35 @@ -1992,12 +1994,12 @@
1.36 break;
1.37 case JVM_CONSTANT_MethodHandle :
1.38 case JVM_CONSTANT_MethodHandleInError :
1.39 - st->print("ref_kind=%d", method_handle_ref_kind_at(index));
1.40 - st->print(" ref_index=%d", method_handle_index_at(index));
1.41 + st->print("ref_kind=%d", method_handle_ref_kind_at_error_ok(index));
1.42 + st->print(" ref_index=%d", method_handle_index_at_error_ok(index));
1.43 break;
1.44 case JVM_CONSTANT_MethodType :
1.45 case JVM_CONSTANT_MethodTypeInError :
1.46 - st->print("signature_index=%d", method_type_index_at(index));
1.47 + st->print("signature_index=%d", method_type_index_at_error_ok(index));
1.48 break;
1.49 case JVM_CONSTANT_InvokeDynamic :
1.50 {
