src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java

*** 25,34 ****
--- 25,35 ----
  import static org.graalvm.compiler.core.common.GraalOptions.MaximumEscapeAnalysisArrayLength;
  
  import java.util.List;
  
  import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.spi.CanonicalizerTool;
  import org.graalvm.compiler.nodes.FixedNode;
  import org.graalvm.compiler.nodes.FixedWithNextNode;
  import org.graalvm.compiler.nodes.ValueNode;
*** 53,72 ****
      private final ConstantReflectionProvider constantReflection;
      private final ConstantFieldProvider constantFieldProvider;
      private final PartialEscapeClosure<?> closure;
      private final Assumptions assumptions;
      private final OptionValues options;
      private final LoweringProvider loweringProvider;
  
      VirtualizerToolImpl(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, PartialEscapeClosure<?> closure,
!                     Assumptions assumptions, OptionValues options, LoweringProvider loweringProvider) {
          this.metaAccess = metaAccess;
          this.constantReflection = constantReflection;
          this.constantFieldProvider = constantFieldProvider;
          this.closure = closure;
          this.assumptions = assumptions;
          this.options = options;
          this.loweringProvider = loweringProvider;
      }
  
      private boolean deleted;
      private PartialEscapeBlockState<?> state;
--- 54,75 ----
      private final ConstantReflectionProvider constantReflection;
      private final ConstantFieldProvider constantFieldProvider;
      private final PartialEscapeClosure<?> closure;
      private final Assumptions assumptions;
      private final OptionValues options;
+     private final DebugContext debug;
      private final LoweringProvider loweringProvider;
  
      VirtualizerToolImpl(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, PartialEscapeClosure<?> closure,
!                     Assumptions assumptions, OptionValues options, DebugContext debug, LoweringProvider loweringProvider) {
          this.metaAccess = metaAccess;
          this.constantReflection = constantReflection;
          this.constantFieldProvider = constantFieldProvider;
          this.closure = closure;
          this.assumptions = assumptions;
          this.options = options;
+         this.debug = debug;
          this.loweringProvider = loweringProvider;
      }
  
      private boolean deleted;
      private PartialEscapeBlockState<?> state;
*** 78,87 ****
--- 81,95 ----
      public OptionValues getOptions() {
          return options;
      }
  
      @Override
+     public DebugContext getDebug() {
+         return debug;
+     }
+ 
+     @Override
      public MetaAccessProvider getMetaAccessProvider() {
          return metaAccess;
      }
  
      @Override
*** 179,189 ****
          }
      }
  
      @Override
      public void createVirtualObject(VirtualObjectNode virtualObject, ValueNode[] entryState, List<MonitorIdNode> locks, boolean ensureVirtualized) {
!         VirtualUtil.trace(options, "{{%s}} ", current);
          if (!virtualObject.isAlive()) {
              effects.addFloatingNode(virtualObject, "newVirtualObject");
          }
          for (int i = 0; i < entryState.length; i++) {
              ValueNode entry = entryState[i];
--- 187,197 ----
          }
      }
  
      @Override
      public void createVirtualObject(VirtualObjectNode virtualObject, ValueNode[] entryState, List<MonitorIdNode> locks, boolean ensureVirtualized) {
!         VirtualUtil.trace(options, debug, "{{%s}} ", current);
          if (!virtualObject.isAlive()) {
              effects.addFloatingNode(virtualObject, "newVirtualObject");
          }
          for (int i = 0; i < entryState.length; i++) {
              ValueNode entry = entryState[i];
*** 195,205 ****
              closure.virtualObjects.add(virtualObject);
              virtualObject.setObjectId(id);
          }
          state.addObject(id, new ObjectState(entryState, locks, ensureVirtualized));
          closure.addVirtualAlias(virtualObject, virtualObject);
!         PartialEscapeClosure.COUNTER_ALLOCATION_REMOVED.increment();
          effects.addVirtualizationDelta(1);
      }
  
      @Override
      public int getMaximumEntryCount() {
--- 203,213 ----
              closure.virtualObjects.add(virtualObject);
              virtualObject.setObjectId(id);
          }
          state.addObject(id, new ObjectState(entryState, locks, ensureVirtualized));
          closure.addVirtualAlias(virtualObject, virtualObject);
!         PartialEscapeClosure.COUNTER_ALLOCATION_REMOVED.increment(debug);
          effects.addVirtualizationDelta(1);
      }
  
      @Override
      public int getMaximumEntryCount() {