*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/PhiResolver.java	Mon Mar 20 17:40:05 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/PhiResolver.java	Mon Mar 20 17:40:05 2017

*** 26,43 ****
--- 26,43 ----
  import static jdk.vm.ci.code.ValueUtil.isIllegal;
  import static jdk.vm.ci.code.ValueUtil.isLegal;
  import static jdk.vm.ci.meta.Value.ILLEGAL;
  
  import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
  
  import org.graalvm.compiler.core.common.CollectionsFactory;
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
  import org.graalvm.compiler.lir.LIRInsertionBuffer;
  import org.graalvm.compiler.lir.LIRInstruction;
  import org.graalvm.compiler.lir.gen.LIRGeneratorTool.MoveFactory;
+ import org.graalvm.util.Equivalence;
+ import org.graalvm.util.EconomicMap;
  
  import jdk.vm.ci.meta.AllocatableValue;
  import jdk.vm.ci.meta.Value;
  
  /**

*** 128,143 ****
--- 128,143 ----
      private final ArrayList<PhiResolverNode> otherOperands = new ArrayList<>(3);
  
      /**
       * Maps operands to nodes.
       */
!     private final HashMap<Value, PhiResolverNode> operandToNodeMap = CollectionsFactory.newMap();
!     private final EconomicMap<Value, PhiResolverNode> operandToNodeMap = EconomicMap.create(Equivalence.DEFAULT);
  
      public static PhiResolver create(LIRGeneratorTool gen) {
          AbstractBlockBase<?> block = gen.getCurrentBlock();
          assert block != null;
!         ArrayList<LIRInstruction> instructions = gen.getResult().getLIR().getLIRforBlock(block);
  
          return new PhiResolver(gen, new LIRInsertionBuffer(), instructions, instructions.size());
      }
  
      public static PhiResolver create(LIRGeneratorTool gen, LIRInsertionBuffer buffer, List<LIRInstruction> instructions, int insertBefore) {