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

*** 20,51 ****
--- 20,50 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir.util;
  
! import java.util.Map;
  
  import org.graalvm.compiler.core.common.CollectionsFactory;
! import org.graalvm.util.Equivalence;
+ import org.graalvm.util.EconomicMap;
  
  import jdk.vm.ci.meta.Value;
  
  public final class GenericValueMap<T> extends ValueMap<Value, T> {
  
!     private final EconomicMap<Value, T> data;
  
      public GenericValueMap() {
!         data = CollectionsFactory.newMap();
!         data = EconomicMap.create(Equivalence.DEFAULT);
      }
  
      @Override
      public T get(Value value) {
          return data.get(value);
      }
  
      @Override
      public void remove(Value value) {
!         data.removeKey(value);
      }
  
      @Override
      public void put(Value value, T object) {
          data.put(value, object);