Address PR feedback: partial debugmacros revert

Author: kg

src/coreclr/gcinfo/arraylist.cpp

@@ -6,14 +6,11 @@
 #undef _ASSERTE
 
 #if defined(_DEBUG)
-
 extern "C" void assertAbort(const char* why, const char* file, unsigned line);
 
 #define _ASSERTE(expr) if (!(expr)) { \
     assertAbort(#expr, __FILE__, __LINE__); \
 }
-#else // _DEBUG
-#define _ASSERTE(expr) (void)0
 #endif // _DEBUG
 
 #include "gcinfohelpers.h"

src/coreclr/gcinfo/gcinfoencoder.cpp

@@ -12,14 +12,11 @@
 #undef _ASSERTE
 
 #if defined(_DEBUG)
-
 extern "C" void assertAbort(const char* why, const char* file, unsigned line);
 
 #define _ASSERTE(expr) if (!(expr)) { \
     assertAbort(#expr, __FILE__, __LINE__); \
 }
-#else // _DEBUG
-#define _ASSERTE(expr) (void)0
 #endif // _DEBUG
 
 

src/coreclr/inc/debugmacros.h

@@ -55,12 +55,8 @@ extern VOID ANALYZER_NORETURN DbgAssertDialog(const char *szFile, int iLine, con
 
 #else // !_DEBUG
 
-#if !defined(_ASSERTE)
-    #define _ASSERTE(expr) ((void)0)
-#endif
-#if !defined(_ASSERTE_MSG)
-    #define _ASSERTE_MSG(expr, msg) ((void)0)
-#endif
+#define _ASSERTE(expr) ((void)0)
+#define _ASSERTE_MSG(expr, msg) ((void)0)
 #define VERIFY(stmt) (void)(stmt)
 
 // At this point, EEPOLICY_HANDLE_FATAL_ERROR may or may not be defined. It will be defined