Mercurial > hg > graal-jvmci-8

diff graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java @ 18471:7b60f8334af0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compare compressed flag in HotSpotObjectConstantImpl#equals and reference equality in HotSpotConstantReflectionProvider#constantEquals
author Andreas Woess <andreas.woess@jku.at>
date Wed, 19 Nov 2014 17:45:40 +0100
parents a3a2359ac88e
children de179c27cad3
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java	Thu Nov 20 10:42:54 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java	Wed Nov 19 17:45:40 2014 +0100
@@ -232,7 +232,13 @@
 
     @Override
     public boolean equals(Object o) {
-        return o == this || (o instanceof HotSpotObjectConstantImpl && super.equals(o) && object == ((HotSpotObjectConstantImpl) o).object);
+        if (o == this) {
+            return true;
+        } else if (o instanceof HotSpotObjectConstantImpl) {
+            HotSpotObjectConstantImpl other = (HotSpotObjectConstantImpl) o;
+            return super.equals(o) && object == other.object && compressed == other.compressed;
+        }
+        return false;
     }
 
     @Override