*** old/src/share/vm/opto/loopnode.cpp	Sat Oct 12 23:25:14 2013
--- new/src/share/vm/opto/loopnode.cpp	Sat Oct 12 23:25:13 2013

*** 165,175 ****
--- 165,175 ----
      // confuses loop predication. So once we hit a Loop in a If branch
      // that doesn't branch to an UNC, we stop. The code that process
      // expensive nodes will notice the loop and skip over it to try to
      // move the node further up.
      if (ctl->is_CountedLoop() && ctl->in(1) != NULL && ctl->in(1)->in(0) != NULL && ctl->in(1)->in(0)->is_If()) {
!       if (!is_uncommon_trap_if_pattern(ctl->in(1)->as_Proj(), Deoptimization::Reason_none)) {
!       if (!ctl->in(1)->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none)) {
          break;
        }
        next = idom(ctl->in(1)->in(0));
      } else if (ctl->is_Proj()) {
        // We only move it up along a projection if the projection is

*** 179,189 ****
--- 179,189 ----
        if (parent_ctl == NULL) {
          break;
        } else if (parent_ctl->is_CountedLoopEnd() && parent_ctl->as_CountedLoopEnd()->loopnode() != NULL) {
          next = parent_ctl->as_CountedLoopEnd()->loopnode()->init_control();
        } else if (parent_ctl->is_If()) {
!         if (!is_uncommon_trap_if_pattern(ctl->as_Proj(), Deoptimization::Reason_none)) {
!         if (!ctl->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none)) {
            break;
          }
          assert(idom(ctl) == parent_ctl, "strange");
          next = idom(parent_ctl);
        } else if (ctl->is_CatchProj()) {