*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java	Fri Jul  7 09:31:56 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java	Fri Jul  7 09:31:56 2017

*** 28,38 ****
--- 28,37 ----
  import java.util.Iterator;
  import java.util.List;
  
  import org.graalvm.compiler.core.common.cfg.Loop;
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.FieldLocationIdentity;
  import org.graalvm.compiler.nodes.FixedWithNextNode;
  import org.graalvm.compiler.nodes.LoopExitNode;
  import org.graalvm.compiler.nodes.PhiNode;

*** 42,54 ****
--- 41,53 ----
  import org.graalvm.compiler.nodes.ValueProxyNode;
  import org.graalvm.compiler.nodes.cfg.Block;
  import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
  import org.graalvm.compiler.nodes.extended.GuardedNode;
  import org.graalvm.compiler.nodes.extended.GuardingNode;
  import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
  import org.graalvm.compiler.nodes.extended.RawLoadNode;
  import org.graalvm.compiler.nodes.extended.RawStoreNode;
+ import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
  import org.graalvm.compiler.nodes.java.AccessFieldNode;
  import org.graalvm.compiler.nodes.java.LoadFieldNode;
  import org.graalvm.compiler.nodes.java.StoreFieldNode;
  import org.graalvm.compiler.nodes.memory.MemoryCheckpoint;
  import org.graalvm.compiler.nodes.memory.ReadNode;

*** 56,68 ****
--- 55,67 ----
  import org.graalvm.compiler.nodes.util.GraphUtil;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.virtual.phases.ea.ReadEliminationBlockState.CacheEntry;
  import org.graalvm.compiler.virtual.phases.ea.ReadEliminationBlockState.LoadCacheEntry;
  import org.graalvm.compiler.virtual.phases.ea.ReadEliminationBlockState.UnsafeLoadCacheEntry;
  import org.graalvm.util.Equivalence;
  import org.graalvm.util.EconomicMap;
  import org.graalvm.util.EconomicSet;
+ import org.graalvm.util.Equivalence;
  import org.graalvm.util.MapCursor;
  import org.graalvm.word.LocationIdentity;
  
  import jdk.vm.ci.meta.JavaKind;
  

*** 357,368 ****
--- 356,367 ----
                      // every location that is alive before the loop but not after is killed by the
                      // loop
                      for (LocationIdentity location : forwardEndLiveLocations) {
                          loopKilledLocations.rememberLoopKilledLocation(location);
                      }
!                     if (Debug.isLogEnabled() && loopKilledLocations != null) {
!                         Debug.log("[Early Read Elimination] Setting loop killed locations of loop at node %s with %s",
!                     if (debug.isLogEnabled() && loopKilledLocations != null) {
!                         debug.log("[Early Read Elimination] Setting loop killed locations of loop at node %s with %s",
                                          loop.getHeader().getBeginNode(), forwardEndLiveLocations);
                      }
                  }
                  // remember the loop visit
                  loopKilledLocations.visited();