Mercurial > hg > truffle
changeset 2500:f100b972fd19
Fixed an issue in the XIR generator that caused a bug in combination with HotSpot's change on static fields. Now all DaCapo's passing.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 26 Apr 2011 20:56:07 +0200 |
parents | ad9b14650e15 |
children | 6594e6d8bfe7 |
files | graal/Runtime/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java Tue Apr 26 16:46:23 2011 +0200 +++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java Tue Apr 26 20:56:07 2011 +0200 @@ -1147,7 +1147,7 @@ public XirSnippet genResolveClass(XirSite site, RiType type, Representation rep) { assert rep == Representation.ObjectHub || rep == Representation.StaticFields || rep == Representation.JavaClass : "unexpected representation: " + rep; if (type.isResolved()) { - return new XirSnippet(resolveClassTemplates.get(site), XirArgument.forObject(type)); + return new XirSnippet(resolveClassTemplates.get(site), XirArgument.forObject(type.getEncoding(rep).asObject())); } return new XirSnippet(resolveClassTemplates.get(site, UNRESOLVED)); }