--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java	2017-03-20 17:37:05.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java	2017-03-20 17:37:05.000000000 -0700
@@ -28,7 +28,7 @@
 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;
@@ -54,15 +54,19 @@
     }
 
     @Override
-    public boolean canInlineConstant(JavaConstant c) {
-        switch (c.getJavaKind()) {
-            case Long:
-                return NumUtil.isInt(c.asLong());
-            case Object:
-                return c.isNull();
-            default:
-                return true;
+    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