coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avod exit-time destructors in macros when possible

Browse Source 
This change attemps to reduce the introduction of exit-time destructors
by gtest/gmock whenever it is possible, to just skip the destructor
during termination. This is useful for codebases that aim to comply with
clang's `-Wexit-time-destructors`. However, this change does not attempt
to make all of gtest/gmock complaint with this warning, but limits
itself to what merely affects user code.

Bug: https://github.com/google/googletest/issues/4803
This commit is contained in:
Claudio DeSouza 2025-07-21 12:02:08 +01:00
parent 7e17b15f15
commit 770390b31c
No known key found for this signature in database
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
googlemock/include/gmock/internal/gmock-port.h
View File

@ -111,7 +111,8 @@
static_assert(true, "no-op to require trailing semicolon") static_assert(true, "no-op to require trailing semicolon")
#define GMOCK_DEFINE_string_(name, default_val, doc) \ #define GMOCK_DEFINE_string_(name, default_val, doc) \
namespace testing { \ namespace testing { \
GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val); \ GTEST_API_ GMOCK_NODESTRUCTOR \
::std::string GMOCK_FLAG(name) = (default_val); \
} \ } \
static_assert(true, "no-op to require trailing semicolon") static_assert(true, "no-op to require trailing semicolon")

2
googletest/include/gtest/gtest-typed-test.h
View File

@ -257,7 +257,7 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
// static as typically these macros are used in a .h file that can be // static as typically these macros are used in a .h file that can be
// #included in multiple translation units linked together. // #included in multiple translation units linked together.
#define TYPED_TEST_SUITE_P(SuiteName) \ #define TYPED_TEST_SUITE_P(SuiteName) \
static ::testing::internal::TypedTestSuitePState \ GTEST_NODESTRUCTOR static ::testing::internal::TypedTestSuitePState \
GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName) GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
// Legacy API is deprecated but still available // Legacy API is deprecated but still available

6
googletest/include/gtest/internal/gtest-internal.h
View File

@ -1514,4 +1514,10 @@ class NeverThrown {
test_suite_name, test_name)>); \ test_suite_name, test_name)>); \
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
#ifdef __clang__
#define GTEST_NODESTRUCTOR [[clang::no_destroy]]
#else
#define GTEST_NODESTRUCTOR
#endif
#endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ #endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_

9
googletest/include/gtest/internal/gtest-port.h
View File

@ -2229,6 +2229,12 @@ using TimeInMillis = int64_t; // Represents time in milliseconds.
#define GTEST_FLAG(name) FLAGS_gtest_##name #define GTEST_FLAG(name) FLAGS_gtest_##name
#endif // !defined(GTEST_FLAG) #endif // !defined(GTEST_FLAG)
#ifdef __clang__
#define GMOCK_NODESTRUCTOR [[clang::no_destroy]]
#else
#define GMOCK_NODESTRUCTOR
#endif
// Pick a command line flags implementation. // Pick a command line flags implementation.
#ifdef GTEST_INTERNAL_HAS_ABSL_FLAGS #ifdef GTEST_INTERNAL_HAS_ABSL_FLAGS
@ -2271,7 +2277,8 @@ using TimeInMillis = int64_t; // Represents time in milliseconds.
static_assert(true, "no-op to require trailing semicolon") static_assert(true, "no-op to require trailing semicolon")
#define GTEST_DEFINE_string_(name, default_val, doc) \ #define GTEST_DEFINE_string_(name, default_val, doc) \
namespace testing { \ namespace testing { \
GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val); \ GTEST_API_ GTEST_NODESTRUCTOR \
::std::string GTEST_FLAG(name) = (default_val); \
} \ } \
static_assert(true, "no-op to require trailing semicolon") static_assert(true, "no-op to require trailing semicolon")