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

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 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) 2012, 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.
*** 38,48 ****
  import org.graalvm.compiler.asm.amd64.AMD64Address;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
  import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules;
- import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
  import org.graalvm.compiler.core.gen.LIRGenerationProvider;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
--- 38,47 ----
*** 89,99 ****
  
      public AMD64HotSpotBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
          super(config, runtime, providers);
      }
  
!     private FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
          RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
          FrameMap frameMap = new AMD64FrameMap(getCodeCache(), registerConfigNonNull, this);
          return new AMD64FrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
      }
  
--- 88,99 ----
  
      public AMD64HotSpotBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
          super(config, runtime, providers);
      }
  
!     @Override
!     protected FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
          RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
          FrameMap frameMap = new AMD64FrameMap(getCodeCache(), registerConfigNonNull, this);
          return new AMD64FrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
      }
  
*** 101,116 ****
      public LIRGeneratorTool newLIRGenerator(LIRGenerationResult lirGenRes) {
          return new AMD64HotSpotLIRGenerator(getProviders(), config, lirGenRes);
      }
  
      @Override
-     public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, RegisterConfig registerConfig, StructuredGraph graph, Object stub) {
-         return new HotSpotLIRGenerationResult(compilationId, lir, newFrameMapBuilder(registerConfig), makeCallingConvention(graph, (Stub) stub), stub,
-                         config.requiresReservedStackCheck(graph.getMethods()));
-     }
- 
-     @Override
      public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
          return new AMD64HotSpotNodeLIRBuilder(graph, lirGen, new AMD64NodeMatchRules(lirGen));
      }
  
      @Override
--- 101,110 ----
*** 217,228 ****
          if (deoptimizationRescueSlot != null && stub == null) {
              crb.compilationResult.setCustomStackAreaOffset(deoptimizationRescueSlot);
          }
  
          if (stub != null) {
!             EconomicSet<Register> destroyedCallerRegisters = gatherDestroyedCallerRegisters(lir);
!             updateStub(stub, destroyedCallerRegisters, gen.getCalleeSaveInfo(), frameMap);
          }
  
          return crb;
      }
  
--- 211,221 ----
          if (deoptimizationRescueSlot != null && stub == null) {
              crb.compilationResult.setCustomStackAreaOffset(deoptimizationRescueSlot);
          }
  
          if (stub != null) {
!             updateStub(stub, gen, frameMap);
          }
  
          return crb;
      }