--- a/src/hotspot/share/prims/jni.cpp	Sat Oct 14 00:19:29 2017 +0200
+++ b/src/hotspot/share/prims/jni.cpp	Sun Oct 15 17:37:29 2017 -0400
@@ -3898,7 +3898,7 @@
 #if defined(ZERO) && defined(ASSERT)
   {
     jint a = 0xcafebabe;
-    jint b = Atomic::xchg(0xdeadbeef, &a);
+    jint b = Atomic::xchg((jint) 0xdeadbeef, &a);
     void *c = &a;
     void *d = Atomic::xchg_ptr(&b, &c);
     assert(a == (jint) 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");