Gabriel B. has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67335?usp=email )
(
7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: base: Enable non-copiable types in gem5_assert message
formatting
......................................................................
base: Enable non-copiable types in gem5_assert message formatting
Previous implementation was taking string formatting arguments by value,
which requires copiability or movability. Took the oportunity to scope
the helper functions inside the macro using lambdas.
Change-Id: I2cefc18df1e99b70e60e64588df61eb72a3e5166
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67335
Tested-by: kokoro <noreply+kok...@google.com>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
Reviewed-by: Bobby Bruce <bbr...@ucdavis.edu>
---
M src/base/logging.hh
M src/base/logging.test.cc
2 files changed, 32 insertions(+), 21 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/logging.hh b/src/base/logging.hh
index 8949b0c..22fd2a8 100644
--- a/src/base/logging.hh
+++ b/src/base/logging.hh
@@ -43,7 +43,6 @@
#include <cassert>
#include <sstream>
-#include <tuple>
#include <utility>
#include "base/compiler.hh"
@@ -289,24 +288,10 @@
#define NDEBUG_DEFINED 0
#endif
-template <typename ...Args>
-inline std::string
-_assertMsg(const std::string &format, Args... args)
-{
- return std::string(": ") + csprintf(format, args...);
-}
-
-inline const char *
-_assertMsg()
-{
- return "";
-}
-
/**
* The assert macro will function like a normal assert, but will use panic
* instead of straight abort(). This allows to perform some cleaning up in
- * ExitLogger::exit() before calling abort(). This macro will not check its
- * condition in fast builds, but it must still be valid code.
+ * ExitLogger::exit() before calling abort().
*
* @param cond Condition that is checked; if false -> panic
* @param ... Printf-based format string with arguments, extends printout.
@@ -315,11 +300,17 @@
*
* @ingroup api_logger
*/
-#define gem5_assert(cond, ...) \
- do { \
- if (GEM5_UNLIKELY(!NDEBUG_DEFINED && !static_cast<bool>(cond))) { \
- panic("assert(" #cond ") failed%s", _assertMsg(__VA_ARGS__)); \
- } \
+#define gem5_assert(cond, ...) \
+ do { \
+ GEM5_UNLIKELY(NDEBUG_DEFINED || static_cast<bool>(cond)) ? \
+ void(0) : \
+ [](const auto&... args) { \
+ auto msg = [&]{ \
+ if constexpr (sizeof...(args) == 0) return ""; \
+ else return std::string(": ") + csprintf(args...); \
+ }; \
+ panic("assert(" #cond ") failed%s", msg()); \
+ }(__VA_ARGS__); \
} while (0)
/** @} */ // end of api_logger
diff --git a/src/base/logging.test.cc b/src/base/logging.test.cc
index 38cc605..5d10f6e 100644
--- a/src/base/logging.test.cc
+++ b/src/base/logging.test.cc
@@ -553,6 +553,9 @@
gem5_assert(true, "message\n");
ASSERT_DEATH(gem5_assert(false, "message\n"), ::testing::HasSubstr(
"panic: assert(false) failed: message\nMemory Usage:"));
+ ASSERT_DEATH(gem5_assert(false, "%s, %s!\n", "Hello", "World"),
+ ::testing::HasSubstr(
+ "panic: assert(false) failed: Hello, World!\nMemory Usage:"));
gem5_assert(true);
ASSERT_DEATH(gem5_assert(false), ::testing::HasSubstr(
"panic: assert(false) failed\nMemory Usage:"));
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67335?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I2cefc18df1e99b70e60e64588df61eb72a3e5166
Gerrit-Change-Number: 67335
Gerrit-PatchSet: 14
Gerrit-Owner: Gabriel B. <gabriel.bus...@arteris.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabriel B. <gabriel.bus...@arteris.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
