diff -r 029d5efaaa6c -r b7c7428eaab9 src/hotspot/share/c1/c1_Canonicalizer.hpp
--- a/src/hotspot/share/c1/c1_Canonicalizer.hpp	Mon Oct 30 16:37:53 2017 +0100
+++ b/src/hotspot/share/c1/c1_Canonicalizer.hpp	Tue Oct 31 11:55:09 2017 -0400
@@ -40,6 +40,10 @@
   void set_constant(jlong x)                     { set_canonical(new Constant(new LongConstant(x))); }
   void set_constant(jfloat x)                    { set_canonical(new Constant(new FloatConstant(x))); }
   void set_constant(jdouble x)                   { set_canonical(new Constant(new DoubleConstant(x))); }
+#ifdef _WINDOWS
+  // jint is defined as long in jni_md.h, so convert from int to jint
+  void set_constant(int x)                       { set_constant((jint)x); }
+#endif
   void move_const_to_right(Op2* x);
   void do_Op2(Op2* x);
   void do_UnsafeRawOp(UnsafeRawOp* x);