# HG changeset patch # User Doug Simon # Date 1386791371 -3600 # Node ID 0fd6c2ab852d85d0f7432f2a366e72486d570e2e # Parent 903fd774dd61e0318a8a8de60d260508769c1841 fixed regression in VerifyOptionsPhase such that it actually checks class initializers again diff -r 903fd774dd61 -r 0fd6c2ab852d graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java Wed Dec 11 20:46:25 2013 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java Wed Dec 11 20:49:31 2013 +0100 @@ -64,12 +64,11 @@ if (superType != null && !MetaUtil.isJavaLangObject(superType)) { checkType(superType, option, metaAccess, foreignCalls, checked); } - for (ResolvedJavaMethod method : type.getDeclaredMethods()) { - if (method.isClassInitializer()) { - StructuredGraph graph = new StructuredGraph(method); - new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getEagerDefault(), OptimisticOptimizations.ALL).apply(graph); - new VerifyOptionsPhase(type, metaAccess, option).apply(graph); - } + ResolvedJavaMethod clinit = type.getClassInitializer(); + if (clinit != null) { + StructuredGraph graph = new StructuredGraph(clinit); + new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getEagerDefault(), OptimisticOptimizations.ALL).apply(graph); + new VerifyOptionsPhase(type, metaAccess, option).apply(graph); } } }