Revert "[nrf toup] VerifyOrDie logging for constrained devices"

This reverts commit 4fd4724.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

build/config/compiler/BUILD.gn

@@ -27,9 +27,6 @@ declare_args() {
   # Enable -Werror. This can be disabled if using a different compiler
   # with unfixed or unsupported wanings.
   treat_warnings_as_errors = true
-
-  # Disable this to allow for overriding built-in defines, such as __FILE__.
-  warn_builtin_macro_redefined = true
 }
 
 if (current_cpu == "arm" || current_cpu == "arm64") {
@@ -212,9 +209,6 @@ config("disabled_warnings") {
       "-Wno-maybe-uninitialized",
     ]
   }
-  if (!warn_builtin_macro_redefined) {
-    cflags += [ "-Wno-builtin-macro-redefined" ]
-  }
 }
 
 config("warnings_common") {

config/nrfconnect/chip-module/CMakeLists.txt

@@ -78,11 +78,6 @@ if (CONFIG_NRF_802154_RADIO_DRIVER)
     zephyr_include_directories($<TARGET_PROPERTY:nrf-802154-driver-interface,INTERFACE_INCLUDE_DIRECTORIES>)
 endif()
 
-if (CONFIG_CHIP_LOG_FILE_NAME)
-    zephyr_compile_definitions(__FILE__=__FILE_NAME__)
-    zephyr_compile_options(-Wno-builtin-macro-redefined)
-endif()
-
 zephyr_get_compile_flags(ZEPHYR_CFLAGS_C C)
 matter_add_cflags("${ZEPHYR_CFLAGS_C}")
 zephyr_get_compile_flags(ZEPHYR_CFLAGS_CC CXX)
@@ -187,10 +182,6 @@ if (NOT CONFIG_CHIP_DEBUG_SYMBOLS)
     matter_add_gn_arg_string("symbol_level" "0")
 endif()
 
-if (CONFIG_CHIP_LOG_FILE_NAME)
-    matter_add_gn_arg_bool("warn_builtin_macro_redefined" FALSE)
-endif()
-
 if (CHIP_COMPILER_LAUNCHER)
     matter_add_gn_arg_string("pw_command_launcher" ${CHIP_COMPILER_LAUNCHER})
 endif()

config/nrfconnect/chip-module/Kconfig

@@ -144,22 +144,6 @@ config CHIP_DEBUG_SYMBOLS
 	help
 	  Enables building the application with debug symbols.
 
-config CHIP_LOG_VERIFY_OR_DIE
-	bool "Log source code location on VerifyOrDie failure"
-	help
-	  Enables the feature to log the file name and line number where the Matter
-	  stack calls the VerifyOrDie macro with the condition evaluating to false.
-
-config CHIP_LOG_FILE_NAME
-	bool "Log file name instead of entire file path"
-	default y
-	help
-	  Enables using a file name instead of an entire file path whenever the
-	  source code location needs to be logged. This is achieved by overriding
-	  the __FILE__ macro with __FILE_NAME__.
-	  This reduces the code size in debug configurations that enable verbose
-	  assertion macros.
-
 config CHIP_MALLOC_SYS_HEAP
 	default y if !ARCH_POSIX
 

src/lib/core/CHIPConfig.h

@@ -1024,17 +1024,6 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE 0
 #endif
 
-/**
- * @def CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND
- *
- * @brief If true, VerifyOrDie() built with @c CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE
- *        generates a short message that includes only the source code location,
- *        without the condition that fails.
- */
-#ifndef CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND
-#define CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND 0
-#endif
-
 /**
  * @def CHIP_CONFIG_CONTROLLER_MAX_ACTIVE_DEVICES
  *

src/lib/support/CodeUtils.h

@@ -527,10 +527,7 @@ inline void chipDie(void)
  *  @sa #chipDie
  *
  */
-#if CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE && CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND
-#define VerifyOrDie(aCondition)                                                                                                    \
-    nlABORT_ACTION(aCondition, ChipLogError(Support, "VerifyOrDie failure at %s:%d", __FILE__, __LINE__))
-#elif CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE
+#if CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE
 #define VerifyOrDie(aCondition)                                                                                                    \
     nlABORT_ACTION(aCondition, ChipLogError(Support, "VerifyOrDie failure at %s:%d: %s", __FILE__, __LINE__, #aCondition))
 #else // CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE

src/platform/nrfconnect/CHIPPlatformConfig.h

@@ -163,10 +163,3 @@
 #define CHIP_CONFIG_ENABLE_BDX_LOG_TRANSFER CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER
 #endif // CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER
 #endif // CHIP_CONFIG_ENABLE_BDX_LOG_TRANSFER
-
-#ifdef CONFIG_CHIP_LOG_VERIFY_OR_DIE
-#define CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE 1
-#ifndef CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND
-#define CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND 1
-#endif // CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE_NO_COND
-#endif // CONFIG_CHIP_LOG_VERIFY_OR_DIE