--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Register.java	Mon May 13 16:47:13 2013 +0200
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Register.java	Mon May 13 17:11:45 2013 +0200
@@ -206,20 +206,18 @@
 
     @Override
     public int hashCode() {
-        final int prime = 17;
-        int result = 1;
-        result = prime * result + encoding;
-        result = prime * result + name.hashCode();
-        result = prime * result + number;
-        result = prime * result + registerCategory.hashCode();
-        return result;
+        return 17 + name.hashCode();
     }
 
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Register) {
             Register other = (Register) obj;
-            return encoding == other.encoding && name.equals(other.name) && number == other.number && registerCategory.equals(registerCategory);
+            if (number == other.number && name.equals(other.name)) {
+                assert encoding == other.encoding;
+                assert registerCategory == other.registerCategory;
+                return true;
+            }
         }
         return false;
     }

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java	Mon May 13 16:47:13 2013 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java	Mon May 13 17:11:45 2013 +0200
@@ -81,11 +81,7 @@
 
     @Override
     public int hashCode() {
-        final int prime = 41;
-        int result = 1;
-        result = prime * result + kind.hashCode();
-        result = prime * result + platformKind.hashCode();
-        return result;
+        return 41 + platformKind.hashCode();
     }
 
     @Override