--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Sep 25 17:47:51 2013 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Thu Sep 26 10:25:02 2013 -0400
@@ -967,9 +967,9 @@
// (These must be implemented as #defines because C++ compilers are
// not obligated to inline non-integral constants!)
#define badAddress ((address)::badAddressVal)
-#define badOop ((oop)::badOopVal)
+#define badOop (cast_to_oop(::badOopVal))
#define badHeapWord (::badHeapWordVal)
-#define badJNIHandle ((oop)::badJNIHandleVal)
+#define badJNIHandle (cast_to_oop(::badJNIHandleVal))
// Default TaskQueue size is 16K (32-bit) or 128K (64-bit)
#define TASKQUEUE_SIZE (NOT_LP64(1<<14) LP64_ONLY(1<<17))