# HG changeset patch # User Thomas Wuerthinger # Date 1346951995 -7200 # Node ID f0f2013be1c9051b17e256cd8f472e117e9a722c # Parent 8c4b96100f6a92a08bea7c1261650460469d02b7 Avoid executing code in the static constructor of HotSpotResolvedType. diff -r 8c4b96100f6a -r f0f2013be1c9 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java Thu Sep 06 18:21:18 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java Thu Sep 06 19:19:55 2012 +0200 @@ -285,10 +285,8 @@ return klassOopCache; } - private static final int SECONDARY_SUPER_CACHE_OFFSET = HotSpotGraalRuntime.getInstance().getConfig().secondarySuperCacheOffset; - public boolean isPrimaryType() { - return SECONDARY_SUPER_CACHE_OFFSET != superCheckOffset; + return HotSpotGraalRuntime.getInstance().getConfig().secondarySuperCacheOffset != superCheckOffset; } public int superCheckOffset() {