Mercurial > hg > graal-jvmci-8
changeset 9987:b270f0856a39
fixed issues detected by VerifyHotSpotOptionsPhase
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 11 Jun 2013 01:32:41 +0200 |
parents | 4f542ceb5fed |
children | 0a59959177c9 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java |
diffstat | 2 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Tue Jun 11 01:31:47 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Tue Jun 11 01:32:41 2013 +0200 @@ -23,6 +23,7 @@ package com.oracle.graal.phases.common; import static com.oracle.graal.phases.GraalOptions.*; +import static com.oracle.graal.phases.common.InliningPhase.Options.*; import java.util.*; import java.util.concurrent.*; @@ -48,10 +49,13 @@ public class InliningPhase extends Phase { - // @formatter:off - @Option(help = "Unconditionally inline intrinsics") - public static final OptionValue<Boolean> AlwaysInlineIntrinsics = new OptionValue<>(false); - // @formatter:on + static class Options { + + // @formatter:off + @Option(help = "Unconditionally inline intrinsics") + public static final OptionValue<Boolean> AlwaysInlineIntrinsics = new OptionValue<>(false); + // @formatter:on + } private final PhasePlan plan; private final MetaAccessProvider runtime;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Tue Jun 11 01:31:47 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Tue Jun 11 01:32:41 2013 +0200 @@ -22,6 +22,8 @@ */ package com.oracle.graal.phases.tiers; +import static com.oracle.graal.phases.tiers.Suites.Options.*; + import java.util.*; import com.oracle.graal.graph.*; @@ -30,10 +32,13 @@ public final class Suites { - // @formatter:off - @Option(help = "The compiler configuration to use") - private static final OptionValue<String> CompilerConfiguration = new OptionValue<>("basic"); - // @formatter:on + static class Options { + + // @formatter:off + @Option(help = "The compiler configuration to use") + static final OptionValue<String> CompilerConfiguration = new OptionValue<>("basic"); + // @formatter:on + } private final PhaseSuite<HighTierContext> highTier; private final PhaseSuite<MidTierContext> midTier;