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

*** 72,82 ****
--- 72,82 ----
  import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.SIN;
  import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.TAN;
  import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.EXP;
  import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicBinaryOp.BinaryIntrinsicOpcode.POW;
  
! import org.graalvm.compiler.asm.NumUtil;
! import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MROp;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp;

*** 1232,1242 ****
--- 1232,1242 ----
              if (JavaConstant.isNull(c)) {
                  getLIRGen().append(new AMD64BinaryConsumer.Op(TEST, size, left, left));
                  return;
              } else if (c instanceof VMConstant) {
                  VMConstant vc = (VMConstant) c;
!                 if (size == DWORD && !GeneratePIC.getValue(getOptions())) {
                      getLIRGen().append(new AMD64BinaryConsumer.VMConstOp(CMP.getMIOpcode(DWORD, false), left, vc));
                  } else {
                      getLIRGen().append(new AMD64BinaryConsumer.DataOp(CMP.getRMOpcode(size), size, left, vc));
                  }
                  return;