src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.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.
*** 22,31 ****
--- 22,33 ----
   */
  
  
  package org.graalvm.compiler.core.test.inlining;
  
+ import java.util.regex.Pattern;
+ 
  import org.graalvm.compiler.core.common.GraalOptions;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.debug.TTY;
*** 39,59 ****
  import org.graalvm.compiler.options.OptionValues;
  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.junit.Assert;
  import org.junit.Ignore;
  import org.junit.Test;
  
  import jdk.vm.ci.code.site.InfopointReason;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
- import java.util.regex.Pattern;
- 
  public class InliningTest extends GraalCompilerTest {
  
      @Test
      public void testInvokeStaticInlining() {
          assertInlined(getGraph("invokeStaticSnippet", false));
--- 41,58 ----
*** 291,301 ****
                                  ? 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;
              }
--- 290,300 ----
                                  ? 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;
              }