OpenJDK / portola / portola
changeset 28043:59286db74db6
Merge
| author | iignatyev |
|---|---|
| date | Tue, 09 Dec 2014 14:49:27 +0000 |
| parents | 40ce95bcdc78 fed7f90dc4c4 |
| children | ede40159fd3b dc52d4bb1316 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/opto/castnode.cpp Tue Dec 09 17:31:40 2014 +0300 +++ b/hotspot/src/share/vm/opto/castnode.cpp Tue Dec 09 14:49:27 2014 +0000 @@ -104,7 +104,8 @@ // Try to improve the type of the CastII if we recognize a CmpI/If // pattern. if (_carry_dependency) { - if (in(0) != NULL && (in(0)->is_IfFalse() || in(0)->is_IfTrue())) { + if (in(0) != NULL && in(0)->in(0) != NULL && in(0)->in(0)->is_If()) { + assert(in(0)->is_IfFalse() || in(0)->is_IfTrue(), "should be If proj"); Node* proj = in(0); if (proj->in(0)->in(1)->is_Bool()) { Node* b = proj->in(0)->in(1);