Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8015265: revise the fix for 8007037
authorccheung
Fri, 24 May 2013 17:19:56 -0700
changeset 17833 52e915e40b15
parent 17831 d8112d90739f
child 17834 7640ccf64175
8015265: revise the fix for 8007037 Reviewed-by: sspitsyn, dholmes, dcubed
hotspot/src/share/vm/oops/constantPool.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/oops/constantPool.cpp	Mon May 27 12:49:08 2013 -0700
+++ b/hotspot/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:
jdk-sandbox