comparison src/share/vm/oops/constantPool.cpp @ 4848:51af5fae397d

8015265: revise the fix for 8007037 Reviewed-by: sspitsyn, dholmes, dcubed
author ccheung
date Fri, 24 May 2013 17:19:56 -0700
parents c115fac239eb
children a1ebd310d5c1
comparison
equal deleted inserted replaced
26:06a396188dd2 28:4ea7e01bee88
1061 { 1061 {
1062 int k1 = invoke_dynamic_name_and_type_ref_index_at(index1); 1062 int k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
1063 int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2); 1063 int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
1064 int i1 = invoke_dynamic_bootstrap_specifier_index(index1); 1064 int i1 = invoke_dynamic_bootstrap_specifier_index(index1);
1065 int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2); 1065 int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2);
1066 bool match = compare_entry_to(k1, cp2, k2, CHECK_false) && 1066 // separate statements and variables because CHECK_false is used
1067 compare_operand_to(i1, cp2, i2, CHECK_false); 1067 bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false);
1068 return match; 1068 bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false);
1069 return (match_entry && match_operand);
1069 } break; 1070 } break;
1070 1071
1071 case JVM_CONSTANT_String: 1072 case JVM_CONSTANT_String:
1072 { 1073 {
1073 Symbol* s1 = unresolved_string_at(index1); 1074 Symbol* s1 = unresolved_string_at(index1);