*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java	Mon Mar 20 17:40:01 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java	Mon Mar 20 17:40:00 2017

*** 20,37 ****
--- 20,37 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir.alloc.trace.lsra;
  
  import static org.graalvm.compiler.lir.LIRValueUtil.asVirtualStackSlot;
  import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue;
  import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
  import static jdk.vm.ci.code.ValueUtil.asRegister;
  import static jdk.vm.ci.code.ValueUtil.asStackSlot;
  import static jdk.vm.ci.code.ValueUtil.isIllegal;
  import static jdk.vm.ci.code.ValueUtil.isRegister;
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
+ import static org.graalvm.compiler.lir.LIRValueUtil.asVirtualStackSlot;
+ import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue;
+ import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
  
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.HashSet;
  import java.util.List;

*** 64,76 ****
--- 64,76 ----
      private final TraceLinearScan allocator;
  
      private int insertIdx;
      private LIRInsertionBuffer insertionBuffer; // buffer where moves are inserted
  
!     private final ArrayList<TraceInterval> mappingFrom;
!     private final ArrayList<Constant> mappingFromOpr;
!     private final List<TraceInterval> mappingTo;
!     private final ArrayList<TraceInterval> mappingTo;
      private final int[] registerBlocked;
  
      private int[] stackBlocked;
      private final int firstVirtualStackIndex;