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

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 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) 2013, 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.
*** 30,39 ****
--- 30,40 ----
  
  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.common.alloc.RegisterAllocationConfig;
  import org.graalvm.compiler.core.gen.LIRGenerationProvider;
  import org.graalvm.compiler.core.target.Backend;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.options.OptionValues;
*** 89,99 ****
          DebugContext debug = getDebugContext(options);
          try (DebugContext.Scope s = debug.scope("assembleMethod", method, codeCache)) {
              RegisterConfig registerConfig = codeCache.getRegisterConfig();
              CompilationIdentifier compilationId = backend.getCompilationIdentifier(method);
              StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).compilationId(compilationId).build();
!             CallingConvention cc = ((LIRGenerationProvider) backend).newLIRGenerationResult(compilationId, null, null, graph, null).getCallingConvention();
  
              CompilationResult compResult = new CompilationResult(graph.compilationId());
              byte[] targetCode = test.generateCode(compResult, codeCache.getTarget(), registerConfig, cc);
              compResult.setTargetCode(targetCode, targetCode.length);
              compResult.setTotalFrameSize(0);
--- 90,101 ----
          DebugContext debug = getDebugContext(options);
          try (DebugContext.Scope s = debug.scope("assembleMethod", method, codeCache)) {
              RegisterConfig registerConfig = codeCache.getRegisterConfig();
              CompilationIdentifier compilationId = backend.getCompilationIdentifier(method);
              StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).compilationId(compilationId).build();
!             RegisterAllocationConfig registerAllocationConfig = backend.newRegisterAllocationConfig(null, null);
!             CallingConvention cc = ((LIRGenerationProvider) backend).newLIRGenerationResult(compilationId, null, registerAllocationConfig, graph, null).getCallingConvention();
  
              CompilationResult compResult = new CompilationResult(graph.compilationId());
              byte[] targetCode = test.generateCode(compResult, codeCache.getTarget(), registerConfig, cc);
              compResult.setTargetCode(targetCode, targetCode.length);
              compResult.setTotalFrameSize(0);