--- a/hotspot/src/share/vm/oops/oop.inline.hpp	Wed Sep 25 17:47:51 2013 +0200
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp	Thu Sep 26 10:25:02 2013 -0400
@@ -183,7 +183,7 @@
 // in inner GC loops so these are separated.
 
 inline bool check_obj_alignment(oop obj) {
-  return (intptr_t)obj % MinObjAlignmentInBytes == 0;
+  return cast_from_oop<intptr_t>(obj) % MinObjAlignmentInBytes == 0;
 }
 
 inline narrowOop oopDesc::encode_heap_oop_not_null(oop v) {