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

*** 33,44 ****
  import org.graalvm.compiler.core.common.CompressEncoding;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.core.common.type.ObjectStamp;
  import org.graalvm.compiler.core.common.type.StampFactory;
! import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.DebugCounter;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
  import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
--- 33,44 ----
  import org.graalvm.compiler.core.common.CompressEncoding;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.core.common.type.ObjectStamp;
  import org.graalvm.compiler.core.common.type.StampFactory;
! import org.graalvm.compiler.debug.CounterKey;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
  import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
*** 53,63 ****
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.meta.JavaKind;
  
  public class AMD64HotSpotAddressLowering extends AMD64AddressLowering {
  
!     private static final DebugCounter counterFoldedUncompressDuringAddressLowering = Debug.counter("FoldedUncompressDuringAddressLowering");
  
      private final long heapBase;
      private final Register heapBaseRegister;
      private final GraalHotSpotVMConfig config;
      private final boolean generatePIC;
--- 53,63 ----
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.meta.JavaKind;
  
  public class AMD64HotSpotAddressLowering extends AMD64AddressLowering {
  
!     private static final CounterKey counterFoldedUncompressDuringAddressLowering = DebugContext.counter("FoldedUncompressDuringAddressLowering");
  
      private final long heapBase;
      private final Register heapBaseRegister;
      private final GraalHotSpotVMConfig config;
      private final boolean generatePIC;
*** 91,119 ****
              this.heapBaseRegister = heapBaseRegister;
          }
      }
  
      @Override
!     protected boolean improve(AMD64AddressNode addr) {
  
          boolean result = false;
  
!         while (super.improve(addr)) {
              result = true;
          }
  
          if (addr.getScale() == Scale.Times1) {
              if (addr.getIndex() instanceof CompressionNode) {
                  if (improveUncompression(addr, (CompressionNode) addr.getIndex(), addr.getBase())) {
!                     counterFoldedUncompressDuringAddressLowering.increment();
                      return true;
                  }
              }
  
              if (addr.getBase() instanceof CompressionNode) {
                  if (improveUncompression(addr, (CompressionNode) addr.getBase(), addr.getIndex())) {
!                     counterFoldedUncompressDuringAddressLowering.increment();
                      return true;
                  }
              }
          }
  
--- 91,119 ----
              this.heapBaseRegister = heapBaseRegister;
          }
      }
  
      @Override
!     protected boolean improve(DebugContext debug, AMD64AddressNode addr) {
  
          boolean result = false;
  
!         while (super.improve(debug, addr)) {
              result = true;
          }
  
          if (addr.getScale() == Scale.Times1) {
              if (addr.getIndex() instanceof CompressionNode) {
                  if (improveUncompression(addr, (CompressionNode) addr.getIndex(), addr.getBase())) {
!                     counterFoldedUncompressDuringAddressLowering.increment(debug);
                      return true;
                  }
              }
  
              if (addr.getBase() instanceof CompressionNode) {
                  if (improveUncompression(addr, (CompressionNode) addr.getBase(), addr.getIndex())) {
!                     counterFoldedUncompressDuringAddressLowering.increment(debug);
                      return true;
                  }
              }
          }