*** old/src/share/vm/opto/loopPredicate.cpp	Wed Jun  3 18:24:01 2015
--- new/src/share/vm/opto/loopPredicate.cpp	Wed Jun  3 18:24:01 2015

*** 436,447 ****
--- 436,453 ----
              all_inputs_invariant = false;
              break;
            }
          }
          if (all_inputs_invariant) {
+           // If n's control is a predicate that was moved out of the
+           // loop, it was marked invariant but n is only invariant if
+           // it depends only on that test. Otherwise, unless that test
+           // is out of the loop, it's not invariant.
+           if (n->is_CFG() || n->depends_only_on_test() || n->in(0) == NULL || !_phase->is_member(_lpt, n->in(0))) {
              _invariant.set(n->_idx); // I am a invariant too
            }
+         }
        } else { // process next input
          _stack.set_index(idx + 1);
          Node* m = n->in(idx);
          if (m != NULL && !_visited.test_set(m->_idx)) {
            visit(n, m);