--- a/hotspot/src/share/vm/opto/lcm.cpp	Thu Sep 26 12:07:53 2013 -0700
+++ b/hotspot/src/share/vm/opto/lcm.cpp	Fri Sep 27 08:39:19 2013 +0200
@@ -472,6 +472,13 @@
           break;
         }
 
+        // For nodes that produce a FlagsProj, make the node adjacent to the
+        // use of the FlagsProj
+        if (use->is_FlagsProj() && get_block_for_node(use) == block) {
+          found_machif = true;
+          break;
+        }
+
         // More than this instruction pending for successor to be ready,
         // don't choose this if other opportunities are ready
         if (ready_cnt.at(use->_idx) > 1)