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

*** 26,36 ****
--- 26,36 ----
  import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
  import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
  import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue;
  import static jdk.vm.ci.code.ValueUtil.isRegister;
  
! import org.graalvm.compiler.asm.NumUtil;
! import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.core.common.type.DataPointerConstant;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.lir.amd64.AMD64AddressValue;
  import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
  import org.graalvm.compiler.lir.amd64.AMD64Move.AMD64StackMove;

*** 52,71 ****
--- 52,75 ----
      public AMD64MoveFactory(BackupSlotProvider backupSlotProvider) {
          super(backupSlotProvider);
      }
  
      @Override
!     public boolean canInlineConstant(JavaConstant c) {
!     public boolean canInlineConstant(Constant con) {
+         if (con instanceof JavaConstant) {
+             JavaConstant c = (JavaConstant) con;
              switch (c.getJavaKind()) {
                  case Long:
                      return NumUtil.isInt(c.asLong());
                  case Object:
                      return c.isNull();
                  default:
                      return true;
              }
          }
+         return false;
+     }
  
      @Override
      public AMD64LIRInstruction createMove(AllocatableValue dst, Value src) {
          if (src instanceof AMD64AddressValue) {
              return new LeaOp(dst, (AMD64AddressValue) src);