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

*** 29,41 ****
--- 29,44 ----
  
  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.CompilationIdentifier;
  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.debug.DebugContext;
+ import org.graalvm.compiler.hotspot.HotSpotBackend;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.stubs.SnippetStub;
  import org.graalvm.compiler.lir.LIRInstructionClass;
*** 44,53 ****
--- 47,57 ----
  import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
  import org.graalvm.compiler.lir.jtt.LIRTest;
  import org.graalvm.compiler.lir.jtt.LIRTestSpecification;
+ import org.graalvm.compiler.nodes.StructuredGraph;
  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;
*** 65,75 ****
  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;
- import org.graalvm.compiler.hotspot.HotSpotBackend;
  
  public class StubAVXTest extends LIRTest {
  
      @Before
      public void checkAMD64() {
--- 69,78 ----
*** 181,194 ****
          @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);
  
--- 184,203 ----
          @Snippet
          static void testStub() {
          }
  
          @Override
!         protected void registerSnippet() {
!         }
! 
!         @Override
!         protected StructuredGraph buildInitialGraph(DebugContext debug, CompilationIdentifier compilationId, Object[] args) {
!             // Build the snippet graph directly since snippet registration is closed at this point.
              ReplacementsImpl d = (ReplacementsImpl) providers.getReplacements();
!             MetaAccessProvider metaAccess = d.getProviders().getMetaAccess();
!             BytecodeProvider bytecodes = new ClassfileBytecodeProvider(metaAccess, d.snippetReflection, ClassLoader.getSystemClassLoader());
!             return d.makeGraph(debug, bytecodes, method, args, null, false, null);
          }
      }
  
      public static final ForeignCallDescriptor TEST_STUB = new ForeignCallDescriptor("test_stub", void.class);