# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1381839990 -7200
# Node ID 737151a29a1f07a6c0c2c734e6dd994936754cd8
# Parent  370b5f07f9e2346a98cca8ef8fdf63c703f8affc
Fix intptr_t to oop casts in vframeArray.cpp and re-enable CHECK_UNHANDLED_OOPS in fastdebug mode

diff -r 370b5f07f9e2 -r 737151a29a1f make/bsd/makefiles/fastdebug.make
--- a/make/bsd/makefiles/fastdebug.make	Tue Oct 15 14:46:25 2013 +0200
+++ b/make/bsd/makefiles/fastdebug.make	Tue Oct 15 14:26:30 2013 +0200
@@ -59,6 +59,5 @@
 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
 
 VERSION = fastdebug
-#SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
-SYSDEFS += -DASSERT
+SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
 PICFLAGS = DEFAULT
diff -r 370b5f07f9e2 -r 737151a29a1f make/linux/makefiles/fastdebug.make
--- a/make/linux/makefiles/fastdebug.make	Tue Oct 15 14:46:25 2013 +0200
+++ b/make/linux/makefiles/fastdebug.make	Tue Oct 15 14:26:30 2013 +0200
@@ -59,6 +59,5 @@
 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
 VERSION = optimized
-#SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
-SYSDEFS += -DASSERT
+SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
 PICFLAGS = DEFAULT
diff -r 370b5f07f9e2 -r 737151a29a1f make/solaris/makefiles/fastdebug.make
--- a/make/solaris/makefiles/fastdebug.make	Tue Oct 15 14:46:25 2013 +0200
+++ b/make/solaris/makefiles/fastdebug.make	Tue Oct 15 14:26:30 2013 +0200
@@ -126,6 +126,5 @@
 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
 VERSION = optimized
-#SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
-SYSDEFS += -DASSERT
+SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
 PICFLAGS = DEFAULT
diff -r 370b5f07f9e2 -r 737151a29a1f make/windows/makefiles/fastdebug.make
--- a/make/windows/makefiles/fastdebug.make	Tue Oct 15 14:46:25 2013 +0200
+++ b/make/windows/makefiles/fastdebug.make	Tue Oct 15 14:26:30 2013 +0200
@@ -38,8 +38,7 @@
 !include ../local.make
 !include compile.make
 
-#CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS"
-CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION)
+CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS"
 
 !include $(WorkSpace)/make/windows/makefiles/vm.make
 !include local.make
diff -r 370b5f07f9e2 -r 737151a29a1f src/share/vm/runtime/vframeArray.cpp
--- a/src/share/vm/runtime/vframeArray.cpp	Tue Oct 15 14:46:25 2013 +0200
+++ b/src/share/vm/runtime/vframeArray.cpp	Tue Oct 15 14:26:30 2013 +0200
@@ -338,7 +338,7 @@
 #ifndef PRODUCT
         if (PrintDeoptimizationDetails) {
           tty->print("Reconstructed expression %d (OBJECT): ", i);
-          oop o = (oop)(*addr);
+          oop o = (oop)(address)(*addr);
           if (o == NULL) {
             tty->print_cr("NULL");
           } else {
@@ -375,7 +375,7 @@
 #ifndef PRODUCT
         if (PrintDeoptimizationDetails) {
           tty->print("Reconstructed local %d (OBJECT): ", i);
-          oop o = (oop)(*addr);
+          oop o = (oop)(address)(*addr);
           if (o == NULL) {
             tty->print_cr("NULL");
           } else {