Mercurial > hg > truffle

changeset 15877:f55153a2ca55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stop propagating probability above loop header.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 13 May 2014 03:57:06 +0200
parents 8df3b6d4a035
children c315c86e2130
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Tue May 13 02:31:41 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Tue May 13 03:57:06 2014 +0200
@@ -657,7 +657,7 @@
                 } else {
                     throw new GraalInternalError("Illegal state");
                 }
-            } else if (node instanceof MergeNode) {
+            } else if (node instanceof MergeNode && !(node instanceof LoopBeginNode)) {
                 for (AbstractEndNode endNode : ((MergeNode) node).cfgPredecessors()) {
                     propagateZeroProbability(endNode);
                 }