src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2016, 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) 2016, 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.
*** 43,52 ****
--- 43,53 ----
  import org.graalvm.compiler.core.GraalCompiler.Request;
  import org.graalvm.compiler.core.LIRGenerationPhase;
  import org.graalvm.compiler.core.LIRGenerationPhase.LIRGenerationContext;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.alloc.ComputeBlockOrder;
+ import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
  import org.graalvm.compiler.core.gen.LIRCompilerBackend;
  import org.graalvm.compiler.core.gen.LIRGenerationProvider;
  import org.graalvm.compiler.core.target.Backend;
  import org.graalvm.compiler.debug.DebugContext;
*** 375,385 ****
          codeEmittingOrder = ComputeBlockOrder.computeCodeEmittingOrder(blocks.length, startBlock);
          linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blocks.length, startBlock);
  
          LIR lir = new LIR(cfg, linearScanOrder, codeEmittingOrder, getGraphOptions(), getGraphDebug());
          LIRGenerationProvider lirBackend = (LIRGenerationProvider) request.backend;
!         lirGenRes = lirBackend.newLIRGenerationResult(graph.compilationId(), lir, registerConfig, request.graph, stub);
          lirGenTool = lirBackend.newLIRGenerator(lirGenRes);
          nodeLirGen = lirBackend.newNodeLIRBuilder(request.graph, lirGenTool);
      }
  
      protected OptionValues getGraphOptions() {
--- 376,387 ----
          codeEmittingOrder = ComputeBlockOrder.computeCodeEmittingOrder(blocks.length, startBlock);
          linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blocks.length, startBlock);
  
          LIR lir = new LIR(cfg, linearScanOrder, codeEmittingOrder, getGraphOptions(), getGraphDebug());
          LIRGenerationProvider lirBackend = (LIRGenerationProvider) request.backend;
!         RegisterAllocationConfig registerAllocationConfig = request.backend.newRegisterAllocationConfig(registerConfig, null);
!         lirGenRes = lirBackend.newLIRGenerationResult(graph.compilationId(), lir, registerAllocationConfig, request.graph, stub);
          lirGenTool = lirBackend.newLIRGenerator(lirGenRes);
          nodeLirGen = lirBackend.newNodeLIRBuilder(request.graph, lirGenTool);
      }
  
      protected OptionValues getGraphOptions() {
*** 439,449 ****
      protected final void allocationStage() {
          applyLIRPhase(getLIRSuites().getAllocationStage(), createAllocationContext());
      }
  
      protected AllocationContext createAllocationContext() {
!         return new AllocationContext(lirGenTool.getSpillMoveFactory(), request.backend.newRegisterAllocationConfig(registerConfig, null));
      }
  
      /**
       * Executes the {@link PostAllocationStage}.
       *
--- 441,451 ----
      protected final void allocationStage() {
          applyLIRPhase(getLIRSuites().getAllocationStage(), createAllocationContext());
      }
  
      protected AllocationContext createAllocationContext() {
!         return new AllocationContext(lirGenTool.getSpillMoveFactory(), lirGenRes.getRegisterAllocationConfig());
      }
  
      /**
       * Executes the {@link PostAllocationStage}.
       *