src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java

*** 24,47 ****
  
  import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest;
  
  import java.lang.reflect.Method;
  
- import org.junit.Assert;
- 
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.code.DisassemblerProvider;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.target.Backend;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.nodes.StructuredGraph;
! import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  import org.graalvm.compiler.serviceprovider.GraalServices;
  import org.graalvm.compiler.test.GraalTest;
  
  import jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.code.CodeCacheProvider;
  import jdk.vm.ci.code.InstalledCode;
  import jdk.vm.ci.code.InvalidInstalledCodeException;
--- 24,47 ----
  
  import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest;
  
  import java.lang.reflect.Method;
  
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.code.DisassemblerProvider;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.target.Backend;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.nodes.StructuredGraph;
! import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  import org.graalvm.compiler.serviceprovider.GraalServices;
+ import org.graalvm.compiler.test.AddExports;
  import org.graalvm.compiler.test.GraalTest;
+ import org.junit.Assert;
  
  import jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.code.CodeCacheProvider;
  import jdk.vm.ci.code.InstalledCode;
  import jdk.vm.ci.code.InvalidInstalledCodeException;
*** 50,69 ****
--- 50,78 ----
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.runtime.JVMCI;
  import jdk.vm.ci.runtime.JVMCIBackend;
  
+ @AddExports("jdk.internal.vm.ci/jdk.vm.ci.runtime")
  public abstract class AssemblerTest extends GraalTest {
  
      private final MetaAccessProvider metaAccess;
      protected final CodeCacheProvider codeCache;
      private final Backend backend;
  
      public interface CodeGenTest {
          byte[] generateCode(CompilationResult compResult, TargetDescription target, RegisterConfig registerConfig, CallingConvention cc);
      }
  
+     /**
+      * Gets the initial option values provided by the Graal runtime. These are option values
+      * typically parsed from the command line.
+      */
+     public static OptionValues getInitialOptions() {
+         return Graal.getRequiredCapability(OptionValues.class);
+     }
+ 
      public AssemblerTest() {
          JVMCIBackend providers = JVMCI.getRuntime().getHostJVMCIBackend();
          this.metaAccess = providers.getMetaAccess();
          this.codeCache = providers.getCodeCache();
          this.backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend();
*** 77,87 ****
      protected InstalledCode assembleMethod(Method m, CodeGenTest test) {
          ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(m);
          try (Scope s = Debug.scope("assembleMethod", method, codeCache)) {
              RegisterConfig registerConfig = codeCache.getRegisterConfig();
              CompilationIdentifier compilationId = backend.getCompilationIdentifier(method);
!             CallingConvention cc = backend.newLIRGenerationResult(compilationId, null, null, new StructuredGraph(method, AllowAssumptions.NO, compilationId), null).getCallingConvention();
  
              CompilationResult compResult = new CompilationResult();
              byte[] targetCode = test.generateCode(compResult, codeCache.getTarget(), registerConfig, cc);
              compResult.setTargetCode(targetCode, targetCode.length);
              compResult.setTotalFrameSize(0);
--- 86,97 ----
      protected InstalledCode assembleMethod(Method m, CodeGenTest test) {
          ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(m);
          try (Scope s = Debug.scope("assembleMethod", method, codeCache)) {
              RegisterConfig registerConfig = codeCache.getRegisterConfig();
              CompilationIdentifier compilationId = backend.getCompilationIdentifier(method);
!             StructuredGraph graph = new StructuredGraph.Builder(getInitialOptions()).method(method).compilationId(compilationId).build();
!             CallingConvention cc = backend.newLIRGenerationResult(compilationId, null, null, graph, null).getCallingConvention();
  
              CompilationResult compResult = new CompilationResult();
              byte[] targetCode = test.generateCode(compResult, codeCache.getTarget(), registerConfig, cc);
              compResult.setTargetCode(targetCode, targetCode.length);
              compResult.setTotalFrameSize(0);