Mercurial > hg > truffle

changeset 9947:f8a4c5011a10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix merge problem in EffectsClosure
author Lukas Stadler <lukas.stadler@jku.at>
date Sat, 08 Jun 2013 15:43:48 +0200
parents 3d09efebcc8e
children b4325bc087c4
files graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java	Fri Jun 07 16:36:13 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java	Sat Jun 08 15:43:48 2013 +0200
@@ -186,17 +186,17 @@
 
         protected final GraphEffectList mergeEffects;
         protected final GraphEffectList afterMergeEffects;
-        protected final BlockT newState;
+        protected BlockT newState;
 
         public MergeProcessor(Block mergeBlock) {
             this.mergeBlock = mergeBlock;
-            this.newState = getInitialState();
             this.merge = (MergeNode) mergeBlock.getBeginNode();
             this.mergeEffects = new GraphEffectList();
             this.afterMergeEffects = new GraphEffectList();
         }
 
         protected void merge(List<BlockT> states) {
+            newState = getInitialState();
             newState.meetAliases(states);
         }
     }