# HG changeset patch # User Lukas Stadler # Date 1370699028 -7200 # Node ID f8a4c5011a10495dd51aded5c1cd96203859cc78 # Parent 3d09efebcc8e5d1263bf615639ef93413252ec5f fix merge problem in EffectsClosure diff -r 3d09efebcc8e -r f8a4c5011a10 graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java --- 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 states) { + newState = getInitialState(); newState.meetAliases(states); } }