src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/PolymorphicInliningTest.java

rev 52889 : 8214023: Update Graal

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 26,36 ****
  
  import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine;
  import static org.graalvm.compiler.test.SubprocessUtil.java;
  import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments;
  
! import jdk.vm.ci.meta.ResolvedJavaMethod;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.DeoptimizeNode;
--- 26,38 ----
  
  import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine;
  import static org.graalvm.compiler.test.SubprocessUtil.java;
  import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments;
  
! import java.io.IOException;
! import java.util.List;
! 
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.DeoptimizeNode;
*** 42,61 ****
  import org.graalvm.compiler.nodes.java.TypeSwitchNode;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
- import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.test.SubprocessUtil;
  import org.junit.Assert;
  import org.junit.Assume;
  import org.junit.Before;
  import org.junit.Test;
  
! import java.io.IOException;
! import java.util.List;
  
  public class PolymorphicInliningTest extends GraalCompilerTest {
  
      @Before
      public void checkJavaAgent() {
--- 44,61 ----
  import org.graalvm.compiler.nodes.java.TypeSwitchNode;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.test.SubprocessUtil;
  import org.junit.Assert;
  import org.junit.Assume;
  import org.junit.Before;
  import org.junit.Test;
  
! import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  public class PolymorphicInliningTest extends GraalCompilerTest {
  
      @Before
      public void checkJavaAgent() {
*** 247,257 ****
                                  ? getCustomGraphBuilderSuite(GraphBuilderConfiguration.getDefault(getDefaultGraphBuilderPlugins()).withFullInfopoints(true))
                                  : getDefaultGraphBuilderSuite();
                  HighTierContext context = new HighTierContext(getProviders(), graphBuilderSuite, OptimisticOptimizations.ALL);
                  debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
                  new CanonicalizerPhase().apply(graph, context);
!                 new InliningPhase(new CanonicalizerPhase()).apply(graph, context);
                  debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
                  new CanonicalizerPhase().apply(graph, context);
                  new DeadCodeEliminationPhase().apply(graph);
                  return graph;
              }
--- 247,257 ----
                                  ? getCustomGraphBuilderSuite(GraphBuilderConfiguration.getDefault(getDefaultGraphBuilderPlugins()).withFullInfopoints(true))
                                  : getDefaultGraphBuilderSuite();
                  HighTierContext context = new HighTierContext(getProviders(), graphBuilderSuite, OptimisticOptimizations.ALL);
                  debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
                  new CanonicalizerPhase().apply(graph, context);
!                 createInliningPhase().apply(graph, context);
                  debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
                  new CanonicalizerPhase().apply(graph, context);
                  new DeadCodeEliminationPhase().apply(graph);
                  return graph;
              }