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

*** 23,39 ****
  
  package org.graalvm.compiler.hotspot.amd64.test;
  
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  
- import org.junit.Assume;
- import org.junit.Before;
- import org.junit.Test;
- 
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.asm.amd64.AMD64Address;
  import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.core.common.type.DataPointerConstant;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl;
--- 23,36 ----
  
  package org.graalvm.compiler.hotspot.amd64.test;
  
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.asm.amd64.AMD64Address;
  import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+ import org.graalvm.compiler.bytecode.BytecodeProvider;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.core.common.type.DataPointerConstant;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl;
*** 50,66 ****
--- 47,70 ----
  import org.graalvm.compiler.nodes.extended.ForeignCallNode;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
+ import org.graalvm.compiler.options.OptionValues;
+ import org.graalvm.compiler.replacements.ReplacementsImpl;
+ import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
+ import org.junit.Assume;
+ import org.junit.Before;
+ import org.junit.Test;
  
  import jdk.vm.ci.amd64.AMD64;
  import jdk.vm.ci.amd64.AMD64.CPUFeature;
  import jdk.vm.ci.amd64.AMD64Kind;
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.code.ValueUtil;
  import jdk.vm.ci.meta.AllocatableValue;
+ import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.meta.Value;
  
  public class StubAVXTest extends LIRTest {
  
*** 161,177 ****
          }
      };
  
      private static class TestStub extends SnippetStub {
  
!         TestStub(HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
!             super("testStub", providers, linkage);
          }
  
          @Snippet
          static void testStub() {
          }
      }
  
      public static final ForeignCallDescriptor TEST_STUB = new ForeignCallDescriptor("test_stub", void.class);
  
      @LIRIntrinsic
--- 165,188 ----
          }
      };
  
      private static class TestStub extends SnippetStub {
  
!         TestStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
!             super("testStub", options, providers, linkage);
          }
  
          @Snippet
          static void testStub() {
          }
+ 
+         @Override
+         protected BytecodeProvider getReplacementsBytecodeProvider() {
+             ReplacementsImpl d = (ReplacementsImpl) providers.getReplacements();
+             MetaAccessProvider metaAccess = d.providers.getMetaAccess();
+             return new ClassfileBytecodeProvider(metaAccess, d.snippetReflection, ClassLoader.getSystemClassLoader());
+         }
      }
  
      public static final ForeignCallDescriptor TEST_STUB = new ForeignCallDescriptor("test_stub", void.class);
  
      @LIRIntrinsic
*** 206,214 ****
      @Test
      public void test() {
          HotSpotProviders providers = (HotSpotProviders) getProviders();
          HotSpotForeignCallsProviderImpl foreignCalls = (HotSpotForeignCallsProviderImpl) providers.getForeignCalls();
          HotSpotForeignCallLinkage linkage = foreignCalls.registerStubCall(TEST_STUB, true, HotSpotForeignCallLinkage.Transition.LEAF_NOFP);
!         linkage.setCompiledStub(new TestStub(providers, linkage));
          runTest("testStub");
      }
  }
--- 217,225 ----
      @Test
      public void test() {
          HotSpotProviders providers = (HotSpotProviders) getProviders();
          HotSpotForeignCallsProviderImpl foreignCalls = (HotSpotForeignCallsProviderImpl) providers.getForeignCalls();
          HotSpotForeignCallLinkage linkage = foreignCalls.registerStubCall(TEST_STUB, true, HotSpotForeignCallLinkage.Transition.LEAF_NOFP);
!         linkage.setCompiledStub(new TestStub(getInitialOptions(), providers, linkage));
          runTest("testStub");
      }
  }