--- a/src/hotspot/share/prims/unsafe.cpp	Tue Apr 03 10:27:46 2018 +0200
+++ b/src/hotspot/share/prims/unsafe.cpp	Tue Apr 03 13:15:27 2018 +0200
@@ -897,7 +897,7 @@
   oop p = JNIHandles::resolve(obj);
   assert_field_offset_sane(p, offset);
   oop ret = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e);
-  return ret == e;
+  return oopDesc::equals(ret, e);
 } UNSAFE_END
 
 UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint e, jint x)) {