Mercurial > hg > truffle

changeset 13296:0fd6c2ab852d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed regression in VerifyOptionsPhase such that it actually checks class initializers again
author Doug Simon <doug.simon@oracle.com>
date Wed, 11 Dec 2013 20:49:31 +0100
parents 903fd774dd61
children d2165b699e0f
files graal/com.oracle.graal.java/src/com/oracle/graal/java/VerifyOptionsPhase.java
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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);
             }
         }
     }