# HG changeset patch # User Thomas Wuerthinger # Date 1303844167 -7200 # Node ID f100b972fd1944c3e77d44e06b57e6971484532b # Parent ad9b14650e1571fbb23a1ddd20238e5bc3d70fef 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. diff -r ad9b14650e15 -r f100b972fd19 graal/Runtime/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java --- 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)); }