*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java	Mon Mar 20 17:37:03 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java	Mon Mar 20 17:37:03 2017

*** 23,33 ****
--- 23,33 ----
  
  package org.graalvm.compiler.core.amd64;
  
  import jdk.vm.ci.meta.JavaConstant;
  
! import org.graalvm.compiler.asm.NumUtil;
! import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.asm.amd64.AMD64Address.Scale;
  import org.graalvm.compiler.core.common.type.IntegerStamp;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.calc.AddNode;
  import org.graalvm.compiler.nodes.calc.LeftShiftNode;