Merge
authordcubed
Tue, 28 May 2013 11:35:57 -0700
changeset 17836 73f35424b806
parent 17834 7640ccf64175 (diff)
parent 17835 c08b5f4bf60f (current diff)
child 17840 3266c41e10e8
child 17858 c292f8791cca
Merge
--- a/hotspot/src/share/vm/oops/constantPool.cpp	Tue May 28 19:54:18 2013 +0400
+++ b/hotspot/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: