src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java

*** 25,35 ****
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  
  import java.util.ArrayList;
  
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
! import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.Indent;
  import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
  import org.graalvm.compiler.hotspot.stubs.Stub;
  import org.graalvm.compiler.lir.LIR;
  import org.graalvm.compiler.lir.LIRFrameState;
--- 25,35 ----
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  
  import java.util.ArrayList;
  
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Indent;
  import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
  import org.graalvm.compiler.hotspot.stubs.Stub;
  import org.graalvm.compiler.lir.LIR;
  import org.graalvm.compiler.lir.LIRFrameState;
*** 80,90 ****
      }
  
      @SuppressWarnings("try")
      private static void processBlock(DiagnosticLIRGeneratorTool diagnosticLirGenTool, HotSpotLIRGenerationResult res, LIR lir, LIRInsertionBuffer buffer, AbstractBlockBase<?> block,
                      boolean zapRegisters, boolean zapStack) {
!         try (Indent indent = Debug.logAndIndent("Process block %s", block)) {
              ArrayList<LIRInstruction> instructions = lir.getLIRforBlock(block);
              buffer.init(instructions);
              for (int index = 0; index < instructions.size(); index++) {
                  LIRInstruction inst = instructions.get(index);
                  if (zapStack && inst instanceof ZapStackArgumentSpaceBeforeInstruction) {
--- 80,91 ----
      }
  
      @SuppressWarnings("try")
      private static void processBlock(DiagnosticLIRGeneratorTool diagnosticLirGenTool, HotSpotLIRGenerationResult res, LIR lir, LIRInsertionBuffer buffer, AbstractBlockBase<?> block,
                      boolean zapRegisters, boolean zapStack) {
!         DebugContext debug = lir.getDebug();
!         try (Indent indent = debug.logAndIndent("Process block %s", block)) {
              ArrayList<LIRInstruction> instructions = lir.getLIRforBlock(block);
              buffer.init(instructions);
              for (int index = 0; index < instructions.size(); index++) {
                  LIRInstruction inst = instructions.get(index);
                  if (zapStack && inst instanceof ZapStackArgumentSpaceBeforeInstruction) {
*** 98,108 ****
                      if (state != null) {
                          SaveRegistersOp zap = diagnosticLirGenTool.createZapRegisters();
                          SaveRegistersOp old = res.getCalleeSaveInfo().put(state, zap);
                          assert old == null : "Already another SaveRegisterOp registered! " + old;
                          buffer.append(index + 1, (LIRInstruction) zap);
!                         Debug.log("Insert ZapRegister after %s", inst);
                      }
                  }
              }
              buffer.finish();
          }
--- 99,109 ----
                      if (state != null) {
                          SaveRegistersOp zap = diagnosticLirGenTool.createZapRegisters();
                          SaveRegistersOp old = res.getCalleeSaveInfo().put(state, zap);
                          assert old == null : "Already another SaveRegisterOp registered! " + old;
                          buffer.append(index + 1, (LIRInstruction) zap);
!                         debug.log("Insert ZapRegister after %s", inst);
                      }
                  }
              }
              buffer.finish();
          }