--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Tue Sep 15 12:59:51 2015 +0000
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Tue Sep 15 11:04:11 2015 -0700
@@ -1413,14 +1413,6 @@
 #define UINTX_FORMAT_W(width) "%" #width PRIuPTR
 
 
-// Enable zap-a-lot if in debug version.
-
-# ifdef ASSERT
-# ifdef COMPILER2
-#   define ENABLE_ZAP_DEAD_LOCALS
-#endif /* COMPILER2 */
-# endif /* ASSERT */
-
 #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
 
 // Dereference vptr