--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java	2017-03-20 17:40:29.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java	2017-03-20 17:40:29.000000000 -0700
@@ -23,9 +23,10 @@
 package org.graalvm.compiler.nodes;
 
 import java.util.EnumMap;
-import java.util.HashSet;
 
 import org.graalvm.compiler.core.common.LocationIdentity;
+import org.graalvm.util.Equivalence;
+import org.graalvm.util.EconomicSet;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaKind.FormatWithToString;
@@ -39,7 +40,7 @@
      * Map for asserting all {@link NamedLocationIdentity} instances have a unique name.
      */
     static class DB {
-        private static final HashSet<String> map = new HashSet<>();
+        private static final EconomicSet<String> map = EconomicSet.create(Equivalence.DEFAULT);
 
         static boolean checkUnique(String name) {
             if (!map.add(name)) {
@@ -59,10 +60,6 @@
      */
     public static final LocationIdentity ARRAY_LENGTH_LOCATION = NamedLocationIdentity.immutable("[].length");
 
-    public static LocationIdentity any() {
-        return ANY_LOCATION;
-    }
-
     private final String name;
     private final boolean immutable;