Mercurial > hg > graal-jvmci-8
diff graal/Runtime/src/com/sun/hotspot/c1x/HotSpotField.java @ 2492:4e5515d09314
Fixed merge issues.
- Accessing static fields from the java.lang.Class object instead of the klassOop (1-line-change)
- Fixed issue with RiField object caching (the caching was only taking the offset as a field ID, but need to take offset+is_static)
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 22 Apr 2011 19:00:07 +0200 |
parents | 099e697d8934 |
children |
line wrap: on
line diff
--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotField.java Fri Apr 22 15:30:53 2011 +0200 +++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotField.java Fri Apr 22 19:00:07 2011 +0200 @@ -24,6 +24,7 @@ import java.lang.reflect.*; import com.sun.c1x.*; +import com.sun.c1x.debug.*; import com.sun.cri.ci.CiConstant; import com.sun.cri.ci.CiKind; import com.sun.cri.ri.RiField; @@ -40,20 +41,21 @@ private final String name; private final RiType type; private final int offset; + private final int accessFlags; private CiConstant constant; - public HotSpotField(Compiler compiler, RiType holder, String name, RiType type, int offset) { + public HotSpotField(Compiler compiler, RiType holder, String name, RiType type, int offset, int accessFlags) { super(compiler); this.holder = holder; this.name = name; this.type = type; this.offset = offset; + this.accessFlags = accessFlags; } @Override public int accessFlags() { - // TODO Auto-generated method stub - return 0; + return accessFlags; } @Override