*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java	Fri Jul  7 09:31:53 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java	Fri Jul  7 09:31:53 2017

*** 23,34 ****
--- 23,34 ----
  package org.graalvm.compiler.virtual.phases.ea;
  
  import java.util.Arrays;
  import java.util.List;
  
! import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.DebugCounter;
! import org.graalvm.compiler.debug.CounterKey;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.java.MonitorIdNode;
  import org.graalvm.compiler.nodes.virtual.EscapeObjectState;
  import org.graalvm.compiler.nodes.virtual.LockState;
  import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;

*** 42,53 ****
--- 42,53 ----
   * the fields or array elements (called "entries") and the lock count if the object is still
   * virtual. If the object was materialized, it contains the current materialized value.
   */
  public class ObjectState {
  
!     public static final DebugCounter CREATE_ESCAPED_OBJECT_STATE = Debug.counter("CreateEscapeObjectState");
!     public static final DebugCounter GET_ESCAPED_OBJECT_STATE = Debug.counter("GetEscapeObjectState");
!     public static final CounterKey CREATE_ESCAPED_OBJECT_STATE = DebugContext.counter("CreateEscapeObjectState");
!     public static final CounterKey GET_ESCAPED_OBJECT_STATE = DebugContext.counter("GetEscapeObjectState");
  
      private ValueNode[] entries;
      private ValueNode materializedValue;
      private LockState locks;
      private boolean ensureVirtualized;

*** 90,103 ****
--- 90,103 ----
  
      public ObjectState cloneState() {
          return new ObjectState(this);
      }
  
!     public EscapeObjectState createEscapeObjectState(DebugContext debug, VirtualObjectNode virtual) {
!         GET_ESCAPED_OBJECT_STATE.increment(debug);
          if (cachedState == null) {
!             CREATE_ESCAPED_OBJECT_STATE.increment(debug);
              if (isVirtual()) {
                  /*
                   * Clear out entries that are default values anyway.
                   *
                   * TODO: this should be propagated into ObjectState.entries, but that will take some