# HG changeset patch
# User dcubed
# Date 1369766157 25200
# Node ID 9ea643afcaaffa58d301029e9c546c8ab860332f
# Parent  4cc7d4d5dc9262881e2d4703a128f510ea22e50d# Parent  01c2bdd24bb505d2c26c4e133fba9ff502f9857e
Merge

diff -r 01c2bdd24bb5 -r 9ea643afcaaf src/share/vm/oops/constantPool.cpp
--- 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: