--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java	Fri Oct 16 00:16:51 2015 +0200
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java	Fri Oct 16 11:12:34 2015 +0200
@@ -81,32 +81,15 @@
     public static class RegisterCategory {
 
         private final String name;
-
         private final boolean mayContainReference;
-        private final int referenceMapOffset;
-        private final int referenceMapShift;
 
         public RegisterCategory(String name) {
-            this(name, true, 0, 0);
+            this(name, true);
         }
 
         public RegisterCategory(String name, boolean mayContainReference) {
-            this(name, mayContainReference, 0, 0);
-        }
-
-        public RegisterCategory(String name, int referenceMapOffset) {
-            this(name, true, referenceMapOffset, 0);
-        }
-
-        public RegisterCategory(String name, int referenceMapOffset, int referenceMapShift) {
-            this(name, true, referenceMapOffset, referenceMapShift);
-        }
-
-        private RegisterCategory(String name, boolean mayContainReference, int referenceMapOffset, int referenceMapShift) {
             this.name = name;
             this.mayContainReference = mayContainReference;
-            this.referenceMapOffset = referenceMapOffset;
-            this.referenceMapShift = referenceMapShift;
         }
 
         @Override
@@ -123,7 +106,7 @@
         public boolean equals(Object obj) {
             if (obj instanceof RegisterCategory) {
                 RegisterCategory that = (RegisterCategory) obj;
-                return this.referenceMapOffset == that.referenceMapOffset && this.referenceMapShift == that.referenceMapShift && this.name.equals(that.name);
+                return this.name.equals(that.name);
             }
             return false;
         }
@@ -156,15 +139,6 @@
     }
 
     /**
-     * Get the start index of this register in the {@link ReferenceMap}. This method may only be
-     * called if {@link #mayContainReference()} is true.
-     */
-    public int getReferenceMapIndex() {
-        assert mayContainReference();
-        return (encoding << registerCategory.referenceMapShift) + registerCategory.referenceMapOffset;
-    }
-
-    /**
      * Gets this register as a {@linkplain RegisterValue value} with a specified kind.
      *
      * @param kind the specified kind