# HG changeset patch
# User zgu
# Date 1369756495 25200
# Node ID 4cc7d4d5dc9262881e2d4703a128f510ea22e50d
# Parent  a213d425d87aadd960c5dd73b12fc0e0351d15bf# Parent  51af5fae397d291b2e835eecd712ac12d45259c2
Merge

diff -r a213d425d87a -r 4cc7d4d5dc92 src/share/vm/oops/constantPool.cpp
--- a/src/share/vm/oops/constantPool.cpp	Tue May 28 15:08:57 2013 +0200
+++ b/src/share/vm/oops/constantPool.cpp	Tue May 28 08:54:55 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: