--- old/src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp	2017-08-16 01:47:27.077340467 -0400
+++ new/src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp	2017-08-16 01:47:26.965334717 -0400
@@ -116,8 +116,9 @@
                                                          T volatile* dest, \
                                                          T compare_value, \
                                                          cmpxchg_memory_order order) const { \
-    return cmpxchg_using_stub<StubType>(StubName, exchange_value, dest, compare_value); \
-}
+    STATIC_ASSERT(ByteSize == sizeof(T));                               \
+    return cmpxchg_using_helper<StubType>(StubName, exchange_value, dest, compare_value); \
+  }
 
 DEFINE_STUB_CMPXCHG(1, jbyte, os::atomic_cmpxchg_byte_func)
 DEFINE_STUB_CMPXCHG(4, jint,  os::atomic_cmpxchg_func)