src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.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.
*** 29,39 ****
  import java.lang.invoke.MethodType;
  import java.security.PrivilegedAction;
  import java.util.function.IntPredicate;
  
  import org.graalvm.compiler.core.common.GraalOptions;
! import org.graalvm.compiler.hotspot.meta.HotSpotClassInitializationPlugin;
  import org.graalvm.compiler.hotspot.meta.HotSpotInvokeDynamicPlugin;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicStubCall;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
--- 29,39 ----
  import java.lang.invoke.MethodType;
  import java.security.PrivilegedAction;
  import java.util.function.IntPredicate;
  
  import org.graalvm.compiler.core.common.GraalOptions;
! import org.graalvm.compiler.hotspot.meta.HotSpotAOTClassInitializationPlugin;
  import org.graalvm.compiler.hotspot.meta.HotSpotInvokeDynamicPlugin;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicStubCall;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
*** 57,67 ****
  
  public class HotSpotInvokeDynamicPluginTest extends HotSpotGraalCompilerTest {
      @Override
      protected Plugins getDefaultGraphBuilderPlugins() {
          Plugins plugins = super.getDefaultGraphBuilderPlugins();
!         plugins.setClassInitializationPlugin(new HotSpotClassInitializationPlugin());
          plugins.setInvokeDynamicPlugin(new HotSpotInvokeDynamicPlugin() {
              @Override
              public boolean isResolvedDynamicInvoke(GraphBuilderContext builder, int index, int opcode) {
                  // Allow invokedynamic testing with older JVMCI
                  ResolvedJavaMethod m = builder.getMethod();
--- 57,67 ----
  
  public class HotSpotInvokeDynamicPluginTest extends HotSpotGraalCompilerTest {
      @Override
      protected Plugins getDefaultGraphBuilderPlugins() {
          Plugins plugins = super.getDefaultGraphBuilderPlugins();
!         plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
          plugins.setInvokeDynamicPlugin(new HotSpotInvokeDynamicPlugin() {
              @Override
              public boolean isResolvedDynamicInvoke(GraphBuilderContext builder, int index, int opcode) {
                  // Allow invokedynamic testing with older JVMCI
                  ResolvedJavaMethod m = builder.getMethod();