src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackLockValue.java

*** 20,43 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.vm.ci.code;
  
! import static jdk.vm.ci.code.ValueUtil.*;
! 
! import jdk.vm.ci.meta.*;
  
  /**
   * Represents lock information in the debug information.
   */
  public final class StackLockValue implements JavaValue {
  
      private JavaValue owner;
!     private StackSlotValue slot;
      private final boolean eliminated;
  
!     public StackLockValue(JavaValue object, StackSlotValue slot, boolean eliminated) {
          this.owner = object;
          this.slot = slot;
          this.eliminated = eliminated;
      }
  
--- 20,43 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.vm.ci.code;
  
! import jdk.vm.ci.meta.AllocatableValue;
! import jdk.vm.ci.meta.JavaValue;
! import jdk.vm.ci.meta.Value;
  
  /**
   * Represents lock information in the debug information.
   */
  public final class StackLockValue implements JavaValue {
  
      private JavaValue owner;
!     private AllocatableValue slot;
      private final boolean eliminated;
  
!     public StackLockValue(JavaValue object, AllocatableValue slot, boolean eliminated) {
          this.owner = object;
          this.slot = slot;
          this.eliminated = eliminated;
      }
  
*** 79,88 ****
              return super.equals(obj) && eliminated == other.eliminated && owner.equals(other.owner) && slot.equals(other.slot);
          }
          return false;
      }
  
!     public void setSlot(StackSlotValue stackSlot) {
!         assert slot == null || (isVirtualStackSlot(slot) && (slot.equals(stackSlot) || isStackSlot(stackSlot))) : String.format("Can not set slot for %s to %s", this, stackSlot);
          slot = stackSlot;
      }
  }
--- 79,87 ----
              return super.equals(obj) && eliminated == other.eliminated && owner.equals(other.owner) && slot.equals(other.slot);
          }
          return false;
      }
  
!     public void setSlot(AllocatableValue stackSlot) {
          slot = stackSlot;
      }
  }