Mercurial > hg > graal-compiler
changeset 10353:9ea643afcaaf
Merge
author | dcubed |
---|---|
date | Tue, 28 May 2013 11:35:57 -0700 |
parents | 4cc7d4d5dc92 (diff) 01c2bdd24bb5 (current diff) |
children | 9e86c5544295 a1ebd310d5c1 |
files | |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/constantPool.cpp Tue May 28 19:54:18 2013 +0400 +++ b/src/share/vm/oops/constantPool.cpp Tue May 28 11:35:57 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: