src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2017, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2017, 2019, 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.
*** 23,33 ****
  
  
  package org.graalvm.compiler.hotspot.test;
  
  import org.graalvm.compiler.core.test.GraalCompilerTest;
! import org.graalvm.compiler.hotspot.meta.HotSpotClassInitializationPlugin;
  import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
  import org.graalvm.compiler.hotspot.phases.aot.EliminateRedundantInitializationPhase;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
--- 23,33 ----
  
  
  package org.graalvm.compiler.hotspot.test;
  
  import org.graalvm.compiler.core.test.GraalCompilerTest;
! import org.graalvm.compiler.hotspot.meta.HotSpotAOTClassInitializationPlugin;
  import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
  import org.graalvm.compiler.hotspot.phases.aot.EliminateRedundantInitializationPhase;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
*** 37,47 ****
  
  public class EliminateRedundantInitializationPhaseTest extends GraalCompilerTest {
      @Override
      protected Plugins getDefaultGraphBuilderPlugins() {
          Plugins plugins = super.getDefaultGraphBuilderPlugins();
!         plugins.setClassInitializationPlugin(new HotSpotClassInitializationPlugin());
          return plugins;
      }
  
      public static class X {
          public static int x;
--- 37,47 ----
  
  public class EliminateRedundantInitializationPhaseTest extends GraalCompilerTest {
      @Override
      protected Plugins getDefaultGraphBuilderPlugins() {
          Plugins plugins = super.getDefaultGraphBuilderPlugins();
!         plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
          return plugins;
      }
  
      public static class X {
          public static int x;
*** 217,224 ****
--- 217,226 ----
          test("invokestatic", 1, 0);
      }
  
      @Test
      public void test12() {
+         // Force initialization of SomeClass
+         SomeClass.inlinedMethod();
          test("invokestaticInlined", 1, 1);
      }
  }