Mercurial > hg > truffle
diff src/share/vm/opto/loopPredicate.cpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 19 Jun 2013 10:45:56 +0200 |
| parents | 6f3fd5150b67 |
| children | 3213ba4d3dff |
line wrap: on
line diff
--- a/src/share/vm/opto/loopPredicate.cpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/opto/loopPredicate.cpp Wed Jun 19 10:45:56 2013 +0200 @@ -821,8 +821,8 @@ loop->dump_head(); } #endif - } else if (cl != NULL && loop->is_range_check_if(iff, this, invar)) { - assert(proj->_con == predicate_proj->_con, "must match"); + } else if ((cl != NULL) && (proj->_con == predicate_proj->_con) && + loop->is_range_check_if(iff, this, invar)) { // Range check for counted loops const Node* cmp = bol->in(1)->as_Cmp();