*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java	Mon Mar 20 17:38:31 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java	Mon Mar 20 17:38:31 2017

*** 25,43 ****
--- 25,42 ----
  import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
  import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
  import static jdk.vm.ci.code.ValueUtil.isRegister;
  
  import java.util.Arrays;
  import java.util.HashMap;
  
  import org.graalvm.compiler.asm.Assembler;
! import org.graalvm.compiler.asm.NumUtil;
! import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.hotspot.debug.BenchmarkCounters;
  import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
  import org.graalvm.compiler.lir.LIRInstruction;
  import org.graalvm.compiler.lir.LIRInstructionClass;
+ import org.graalvm.util.EconomicMap;
  
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.code.TargetDescription;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.JavaKind;

*** 100,110 ****
--- 99,109 ----
              int arrayIndex = getIndex(names[0], groups[0], increments[0]);
              int displacement = getDisplacementForLongIndex(target, arrayIndex);
              proc.apply(0, increments[0], displacement);
          } else { // Slow path with sort by displacements ascending
              int[] displacements = new int[names.length];
!             HashMap<Integer, Integer> offsetMap = new HashMap<>(names.length);
!             EconomicMap<Integer, Integer> offsetMap = EconomicMap.create();
              for (int i = 0; i < names.length; i++) {
                  int arrayIndex = getIndex(names[i], groups[i], increments[i]);
                  displacements[i] = getDisplacementForLongIndex(target, arrayIndex);
                  offsetMap.put(displacements[i], i);
              }