Mercurial > hg > truffle
changeset 19042:0d7302ddcc90
Bugfix: static and instance field with same offset are not equal
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Thu, 29 Jan 2015 16:34:55 -0800 |
parents | 9a659d65bddd |
children | d77073bffd10 76dd59e530b2 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);