Mercurial > hg > graal-compiler
diff src/share/vm/opto/multnode.cpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 24 Mar 2014 21:30:43 +0100 |
| parents | de9cd35a3d1f |
| children |
line wrap: on
line diff
--- a/src/share/vm/opto/multnode.cpp Fri Mar 21 16:36:59 2014 -0700 +++ b/src/share/vm/opto/multnode.cpp Mon Mar 24 21:30:43 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -194,9 +194,7 @@ } } - ProjNode* other_proj = iff->proj_out(1-_con); - if (other_proj == NULL) // Should never happen, but make Parfait happy. - return false; + ProjNode* other_proj = iff->proj_out(1-_con)->as_Proj(); if (other_proj->is_uncommon_trap_proj(reason)) { assert(reason == Deoptimization::Reason_none || Compile::current()->is_predicate_opaq(iff->in(1)->in(1)), "should be on the list");