Mercurial > hg > graal-compiler
changeset 7926:9e3c0d8bca65
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 15:29:06 +0100 |
parents | c7d7d9936809 (current diff) 17d0bdb44cb6 (diff) |
children | 57726bff1d9f |
files | |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Tue Mar 05 15:20:35 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Tue Mar 05 15:29:06 2013 +0100 @@ -152,10 +152,8 @@ ((StructuredGraph) graph()).removeSplit(this, falseSuccessor()); } } else if (trueSuccessor().guards().isEmpty() && falseSuccessor().guards().isEmpty()) { - if (removeOrMaterializeIf(tool)) { - return; - } else if (removeIntermediateMaterialization(tool)) { - return; + if (!removeOrMaterializeIf(tool)) { + removeIntermediateMaterialization(tool); } } }