changeset 7404:78234388ae4f

Merge
author roland
date Wed, 10 Jun 2015 19:50:15 +0200
parents b091956d885c 6b40d295742c
children cd8fe1a9205a
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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();