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

rev 52889 : 8214023: Update Graal

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 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.
*** 25,43 ****
  package org.graalvm.compiler.core.test;
  
  import java.util.HashMap;
  import java.util.Map;
  
- import org.junit.Test;
- 
  import org.graalvm.compiler.nodes.Invoke;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  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;
  
  public class InvokeExceptionTest extends GraalCompilerTest {
  
      public static synchronized void throwException(int i) {
          if (i == 1) {
--- 25,41 ----
  package org.graalvm.compiler.core.test;
  
  import java.util.HashMap;
  import java.util.Map;
  
  import org.graalvm.compiler.nodes.Invoke;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
+ import org.junit.Test;
  
  public class InvokeExceptionTest extends GraalCompilerTest {
  
      public static synchronized void throwException(int i) {
          if (i == 1) {
*** 69,78 ****
          Map<Invoke, Double> hints = new HashMap<>();
          for (Invoke invoke : graph.getInvokes()) {
              hints.put(invoke, 1000d);
          }
          HighTierContext context = getDefaultHighTierContext();
!         new InliningPhase(hints, new CanonicalizerPhase()).apply(graph, context);
          new CanonicalizerPhase().apply(graph, context);
          new DeadCodeEliminationPhase().apply(graph);
      }
  }
--- 67,76 ----
          Map<Invoke, Double> hints = new HashMap<>();
          for (Invoke invoke : graph.getInvokes()) {
              hints.put(invoke, 1000d);
          }
          HighTierContext context = getDefaultHighTierContext();
!         createInliningPhase(hints, new CanonicalizerPhase()).apply(graph, context);
          new CanonicalizerPhase().apply(graph, context);
          new DeadCodeEliminationPhase().apply(graph);
      }
  }