--- a/src/hotspot/share/utilities/debug.hpp Thu Feb 14 09:38:19 2019 -0800
+++ b/src/hotspot/share/utilities/debug.hpp Thu Feb 14 19:48:57 2019 +0100
@@ -54,9 +54,6 @@
do { \
if (!(p)) { \
TOUCH_ASSERT_POISON; \
- if (is_executing_unit_tests()) { \
- report_assert_msg(__VA_ARGS__); \
- } \
report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", __VA_ARGS__); \
BREAKPOINT; \
} \
@@ -157,16 +154,10 @@
// ATTRIBUTE_PRINTF works with gcc >= 4.8 and any other compiler.
void report_vm_error(const char* file, int line, const char* error_msg,
const char* detail_fmt, ...) ATTRIBUTE_PRINTF(4, 5);
-#ifdef ASSERT
-void report_assert_msg(const char* msg, ...) ATTRIBUTE_PRINTF(1, 2);
-#endif // ASSERT
#else
// GCC < 4.8 warns because of empty format string. Warning can not be switched off selectively.
void report_vm_error(const char* file, int line, const char* error_msg,
const char* detail_fmt, ...);
-#ifdef ASSERT
-void report_assert_msg(const char* msg, ...);
-#endif // ASSERT
#endif
void report_vm_status_error(const char* file, int line, const char* error_msg,
int status, const char* detail);
@@ -178,11 +169,6 @@
void report_unimplemented(const char* file, int line);
void report_untested(const char* file, int line, const char* message);
-#ifdef ASSERT
-// unit test support
-bool is_executing_unit_tests();
-#endif // ASSERT
-
void warning(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
// Compile-time asserts. Cond must be a compile-time constant expression that