# HG changeset patch # User Thomas Wuerthinger # Date 1379546446 -7200 # Node ID 8fa3a9f1dda4d4745f6a5d73b26c8357ce91172a # Parent 9c9bc8c6a0dfdae9f2cc30dcf0e310c4fcebda8d Simplifications to the partial evaluator. diff -r 9c9bc8c6a0df -r 8fa3a9f1dda4 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Thu Sep 19 01:07:07 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Thu Sep 19 01:20:46 2013 +0200 @@ -46,7 +46,6 @@ import com.oracle.graal.nodes.util.*; import com.oracle.graal.nodes.virtual.*; import com.oracle.graal.phases.*; -import com.oracle.graal.phases.PhasePlan.PhasePosition; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.common.CanonicalizerPhase.CustomCanonicalizer; import com.oracle.graal.phases.tiers.*; @@ -114,7 +113,6 @@ Debug.scope("createGraph", graph, new Runnable() { - @SuppressWarnings("deprecation") @Override public void run() { new GraphBuilderPhase(metaAccessProvider, config, TruffleCompilerImpl.Optimizations).apply(graph); @@ -157,18 +155,8 @@ // Additional inlining. final PhasePlan plan = new PhasePlan(); - GraphBuilderPhase graphBuilderPhase = new GraphBuilderPhase(metaAccessProvider, config, TruffleCompilerImpl.Optimizations); - plan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase); - canonicalizer.addToPhasePlan(plan, baseContext); - plan.addPhase(PhasePosition.AFTER_PARSING, new ReplaceIntrinsicsPhase(replacements)); - - new ConvertDeoptimizeToGuardPhase().apply(graph); canonicalizer.apply(graph, baseContext); - new DeadCodeEliminationPhase().apply(graph); - HighTierContext context = new HighTierContext(metaAccessProvider, assumptions, replacements, cache, plan, OptimisticOptimizations.NONE); - InliningPhase inliningPhase = new InliningPhase(canonicalizer); - inliningPhase.apply(graph, context); for (NeverPartOfCompilationNode neverPartOfCompilationNode : graph.getNodes(NeverPartOfCompilationNode.class)) { Throwable exception = new VerificationError(neverPartOfCompilationNode.getMessage());