Mercurial > hg > truffle
changeset 10350:51af5fae397d
8015265: revise the fix for 8007037
Reviewed-by: sspitsyn, dholmes, dcubed
author | ccheung |
---|---|
date | Fri, 24 May 2013 17:19:56 -0700 |
parents | 3970971c91e0 |
children | 4cc7d4d5dc92 |
files | src/share/vm/oops/constantPool.cpp |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/constantPool.cpp Mon May 27 12:49:08 2013 -0700 +++ b/src/share/vm/oops/constantPool.cpp Fri May 24 17:19:56 2013 -0700 @@ -1063,9 +1063,10 @@ int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2); int i1 = invoke_dynamic_bootstrap_specifier_index(index1); int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2); - bool match = compare_entry_to(k1, cp2, k2, CHECK_false) && - compare_operand_to(i1, cp2, i2, CHECK_false); - return match; + // separate statements and variables because CHECK_false is used + bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false); + bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false); + return (match_entry && match_operand); } break; case JVM_CONSTANT_String: