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

rev 52889 : 8214023: Update Graal

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2014, 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) 2011, 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.
*** 30,40 ****
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.ValueNode;
  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.virtual.phases.ea.PartialEscapePhase;
  import org.junit.Assert;
  import org.junit.Ignore;
  import org.junit.Test;
--- 30,39 ----
*** 311,321 ****
      }
  
      private void processMethod(final String snippet) {
          graph = parseEager(snippet, AllowAssumptions.NO);
          HighTierContext context = getDefaultHighTierContext();
!         new InliningPhase(new CanonicalizerPhase()).apply(graph, context);
          new PartialEscapePhase(false, new CanonicalizerPhase(), graph.getOptions()).apply(graph, context);
      }
  
      private void compareGraphs(final String snippet, final String referenceSnippet) {
          compareGraphs(snippet, referenceSnippet, false, false);
--- 310,320 ----
      }
  
      private void processMethod(final String snippet) {
          graph = parseEager(snippet, AllowAssumptions.NO);
          HighTierContext context = getDefaultHighTierContext();
!         createInliningPhase().apply(graph, context);
          new PartialEscapePhase(false, new CanonicalizerPhase(), graph.getOptions()).apply(graph, context);
      }
  
      private void compareGraphs(final String snippet, final String referenceSnippet) {
          compareGraphs(snippet, referenceSnippet, false, false);
*** 324,334 ****
      private void compareGraphs(final String snippet, final String referenceSnippet, final boolean loopPeeling, final boolean excludeVirtual) {
          graph = parseEager(snippet, AllowAssumptions.NO);
          HighTierContext context = getDefaultHighTierContext();
          CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
          canonicalizer.apply(graph, context);
!         new InliningPhase(new CanonicalizerPhase()).apply(graph, context);
          if (loopPeeling) {
              new LoopPeelingPhase(new DefaultLoopPolicies()).apply(graph, context);
          }
          new DeadCodeEliminationPhase().apply(graph);
          canonicalizer.apply(graph, context);
--- 323,333 ----
      private void compareGraphs(final String snippet, final String referenceSnippet, final boolean loopPeeling, final boolean excludeVirtual) {
          graph = parseEager(snippet, AllowAssumptions.NO);
          HighTierContext context = getDefaultHighTierContext();
          CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
          canonicalizer.apply(graph, context);
!         createInliningPhase().apply(graph, context);
          if (loopPeeling) {
              new LoopPeelingPhase(new DefaultLoopPolicies()).apply(graph, context);
          }
          new DeadCodeEliminationPhase().apply(graph);
          canonicalizer.apply(graph, context);
*** 336,346 ****
  
          new DeadCodeEliminationPhase().apply(graph);
          canonicalizer.apply(graph, context);
  
          StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.YES);
!         new InliningPhase(new CanonicalizerPhase()).apply(referenceGraph, context);
          new DeadCodeEliminationPhase().apply(referenceGraph);
          new CanonicalizerPhase().apply(referenceGraph, context);
  
          assertEquals(referenceGraph, graph, excludeVirtual, true);
      }
--- 335,345 ----
  
          new DeadCodeEliminationPhase().apply(graph);
          canonicalizer.apply(graph, context);
  
          StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.YES);
!         createInliningPhase().apply(referenceGraph, context);
          new DeadCodeEliminationPhase().apply(referenceGraph);
          new CanonicalizerPhase().apply(referenceGraph, context);
  
          assertEquals(referenceGraph, graph, excludeVirtual, true);
      }