# HG changeset patch
# User roland
# Date 1433958615 -7200
# Node ID 78234388ae4f002426052ae1fb0e2dbe30721d82
# Parent  b091956d885c721b4d7d542b5b14b2dac7b068d1# Parent  6b40d295742c4928d7b7c4d75b213871fa591395
Merge

diff -r b091956d885c -r 78234388ae4f src/share/vm/opto/loopTransform.cpp
--- a/src/share/vm/opto/loopTransform.cpp	Wed Jun 10 19:44:59 2015 +0200
+++ b/src/share/vm/opto/loopTransform.cpp	Wed Jun 10 19:50:15 2015 +0200
@@ -1821,7 +1821,10 @@
   // Find the pre-loop limit; we will expand it's iterations to
   // not ever trip low tests.
   Node *p_f = iffm->in(0);
-  assert(p_f->Opcode() == Op_IfFalse, "");
+  // pre loop may have been optimized out
+  if (p_f->Opcode() != Op_IfFalse) {
+    return;
+  }
   CountedLoopEndNode *pre_end = p_f->in(0)->as_CountedLoopEnd();
   assert(pre_end->loopnode()->is_pre_loop(), "");
   Node *pre_opaq1 = pre_end->limit();