# HG changeset patch
# User Christian Wimmer <christian.wimmer@oracle.com>
# Date 1422578095 28800
# Node ID 0d7302ddcc9015820d79ec752cb705d5a1a2c194
# Parent  9a659d65bdddc1a4bfa071c9b4bb7cb45991a4ed
Bugfix: static and instance field with same offset are not equal

diff -r 9a659d65bddd -r 0d7302ddcc90 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java	Thu Jan 29 16:33:33 2015 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java	Thu Jan 29 16:34:55 2015 -0800
@@ -66,7 +66,7 @@
         }
         if (obj instanceof HotSpotResolvedJavaField) {
             HotSpotResolvedJavaFieldImpl that = (HotSpotResolvedJavaFieldImpl) obj;
-            if (that.offset != this.offset) {
+            if (that.offset != this.offset || that.isStatic() != this.isStatic()) {
                 return false;
             } else if (this.holder.equals(that.holder)) {
                 assert this.name.equals(that.name) && this.type.equals(that.type);