# HG changeset patch
# User ccheung
# Date 1369441196 25200
# Node ID 51af5fae397d291b2e835eecd712ac12d45259c2
# Parent  3970971c91e0b98ccec96c966a566fb0a0aa7b36
8015265: revise the fix for 8007037
Reviewed-by: sspitsyn, dholmes, dcubed

diff -r 3970971c91e0 -r 51af5fae397d src/share/vm/oops/constantPool.cpp
--- 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: