--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java	Fri Jan 03 11:46:35 2014 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java	Fri Jan 03 11:48:36 2014 -0800
@@ -418,9 +418,15 @@
         return method;
     }
 
-    public synchronized ResolvedJavaField createField(String fieldName, JavaType type, long offset, int flags, boolean internal) {
+    public synchronized ResolvedJavaField createField(String fieldName, JavaType type, long offset, int rawFlags, boolean internal) {
         ResolvedJavaField result = null;
 
+        /*
+         * Filter out flags used internally by HotSpot, to get a canonical id value. When a field is
+         * created from a java.lang.reflect.Field, these flags would not be available anyway.
+         */
+        int flags = rawFlags & fieldModifiers();
+
         long id = offset + ((long) flags << 32);
 
         // (thomaswue) Must cache the fields, because the local load elimination only works if the
@@ -436,7 +442,7 @@
             fieldCache.put(id, result);
         } else {
             assert result.getName().equals(fieldName);
-            assert result.getModifiers() == (fieldModifiers() & flags);
+            assert result.getModifiers() == flags;
         }
 
         return result;