src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java

rev 52889 : 8214023: Update Graal

*** 45,62 ****
  import org.graalvm.compiler.options.OptionKey;
  import org.graalvm.compiler.options.OptionType;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
- import org.graalvm.compiler.phases.common.NodeCounterPhase;
  import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
  import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
  import org.graalvm.compiler.phases.common.LoweringPhase;
  import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.virtual.phases.ea.EarlyReadEliminationPhase;
  import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
  
  public class HighTier extends PhaseSuite<HighTierContext> {
--- 45,63 ----
  import org.graalvm.compiler.options.OptionKey;
  import org.graalvm.compiler.options.OptionType;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
  import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
  import org.graalvm.compiler.phases.common.LoweringPhase;
+ import org.graalvm.compiler.phases.common.NodeCounterPhase;
  import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
+ import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.virtual.phases.ea.EarlyReadEliminationPhase;
  import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
  
  public class HighTier extends PhaseSuite<HighTierContext> {
*** 80,90 ****
          if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
              appendPhase(new NodeCounterPhase(NodeCounterPhase.Stage.INIT));
          }
  
          if (Options.Inline.getValue(options)) {
!             appendPhase(new InliningPhase(canonicalizer));
              appendPhase(new DeadCodeEliminationPhase(Optional));
          }
  
          if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
              appendPhase(new NodeCounterPhase(NodeCounterPhase.Stage.EARLY));
--- 81,91 ----
          if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
              appendPhase(new NodeCounterPhase(NodeCounterPhase.Stage.INIT));
          }
  
          if (Options.Inline.getValue(options)) {
!             appendPhase(new InliningPhase(new GreedyInliningPolicy(null), canonicalizer));
              appendPhase(new DeadCodeEliminationPhase(Optional));
          }
  
          if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
              appendPhase(new NodeCounterPhase(NodeCounterPhase.Stage.EARLY));