Skip to content

[libc]: Remove -Wglobal-constructors for libc tests #131485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Apr 16, 2025
Merged

[libc]: Remove -Wglobal-constructors for libc tests #131485

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6dd5a77
`-Wglobal-constructors`
vinay-deshmukh Mar 16, 2025
a142b5b
Werror to break pipeline
vinay-deshmukh Mar 16, 2025
6b558fb
Use static member instances
vinay-deshmukh Mar 18, 2025
168dc9d
cf
vinay-deshmukh Mar 20, 2025
70ba2f9
try to isolate warning
vinay-deshmukh Mar 20, 2025
9bb0c5b
constexpr ctor
vinay-deshmukh Mar 23, 2025
ca587e0
instance is constexpr
vinay-deshmukh Mar 23, 2025
82a84bb
default constexpr for Test
vinay-deshmukh Mar 23, 2025
05733f7
outside
vinay-deshmukh Mar 23, 2025
928e5c1
remove virtual dtor
vinay-deshmukh Mar 23, 2025
0ab2965
note: non-constexpr function addTest cannot be used in a constant exp…
vinay-deshmukh Mar 23, 2025
ec4be66
restore to original
vinay-deshmukh Mar 23, 2025
620bf4a
pragma wrap
vinay-deshmukh Mar 23, 2025
e8be053
pragma wrap
vinay-deshmukh Mar 23, 2025
889c3ba
undo pragma
vinay-deshmukh Mar 24, 2025
94a783b
remove pragma attempt
vinay-deshmukh Mar 30, 2025
f20b84d
Fix cmake failure
vinay-deshmukh Mar 30, 2025
fbb0ca5
Use _Pragma correctly
vinay-deshmukh Mar 30, 2025
009b11b
collisions
vinay-deshmukh Mar 30, 2025
54b604a
warning: extra ';' outside of a function is incompatible with C++98 […
vinay-deshmukh Mar 30, 2025
ccf13f3
Assume it's an intentional global
vinay-deshmukh Mar 30, 2025
9b0cff4
another one
vinay-deshmukh Mar 30, 2025
ad8f2e7
thread_local
vinay-deshmukh Mar 30, 2025
53bacd0
thread_local
vinay-deshmukh Mar 30, 2025
8ed51cc
Undo code fixes
vinay-deshmukh Apr 15, 2025
bb7b9a5
Werror no longer needed
vinay-deshmukh Apr 15, 2025
cc03d0e
Remove global constructors error in libc tests
vinay-deshmukh Apr 15, 2025
1fc892b
Merge remote-tracking branch 'upstream/main' into vinay-issue-119281-…
vinay-deshmukh Apr 15, 2025
db914c2
Fix main's changes
vinay-deshmukh Apr 15, 2025
74535b8
Merge branch 'main' into vinay-issue-119281-global-constructors
vinay-deshmukh Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions("-D_DEBUG")
endif()

add_compile_options("-Werror=global-constructors")

# Default to C++17
set(CMAKE_CXX_STANDARD 17)
Expand Down
2 changes: 1 addition & 1 deletion libc/cmake/modules/LLVMLibCTestRules.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function(_get_common_test_compile_options output_var c_test flags)
list(APPEND compile_options "-Wnewline-eof")
list(APPEND compile_options "-Wnonportable-system-include-path")
list(APPEND compile_options "-Wthread-safety")
# list(APPEND compile_options "-Wglobal-constructors")
list(APPEND compile_options "-Wglobal-constructors")
endif()
endif()
set(${output_var} ${compile_options} PARENT_SCOPE)
Expand Down
21 changes: 21 additions & 0 deletions libc/test/UnitTest/LibcTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,15 @@ CString libc_make_test_file_path_func(const char *file_name);
return "[ParamType = " #TYPE "]"; \
}


#define DO_PRAGMA(x) _Pragma (#x);

#define DO_PRAGMA_BEGIN DO_PRAGMA(GCC diagnostic push)

#define DO_PRAGMA_BODY DO_PRAGMA(GCC diagnostic ignored "-Wglobal-constructors")

#define DO_PRAGMA_END DO_PRAGMA(GCC diagnostic pop)

#define TYPED_TEST(SuiteName, TestName, TypeList) \
static_assert( \
LIBC_NAMESPACE::testing::internal::valid_prefix(#SuiteName), \
Expand All @@ -351,8 +360,11 @@ CString libc_make_test_file_path_func(const char *file_name);
void Run() override; \
const char *getName() const override { return name; } \
}; \
DO_PRAGMA_BEGIN \
DO_PRAGMA_BODY \
TypeList::Tests<SuiteName##_##TestName>::type \
SuiteName##_##TestName##_Instance; \
DO_PRAGMA_END \
template <typename T> void SuiteName##_##TestName<T>::Run()

#define TYPED_TEST_F(SuiteClass, TestName, TypeList) \
Expand All @@ -371,8 +383,11 @@ CString libc_make_test_file_path_func(const char *file_name);
void Run() override; \
const char *getName() const override { return name; } \
}; \
DO_PRAGMA_BEGIN \
DO_PRAGMA_BODY \
TypeList::Tests<SuiteClass##_##TestName>::type \
SuiteClass##_##TestName##_Instance; \
DO_PRAGMA_END \
template <typename T> void SuiteClass##_##TestName<T>::Run()

#define TEST(SuiteName, TestName) \
Expand All @@ -384,7 +399,10 @@ CString libc_make_test_file_path_func(const char *file_name);
void Run() override; \
const char *getName() const override { return #SuiteName "." #TestName; } \
}; \
DO_PRAGMA_BEGIN \
DO_PRAGMA_BODY \
SuiteName##_##TestName SuiteName##_##TestName##_Instance; \
DO_PRAGMA_END \
void SuiteName##_##TestName::Run()

#define TEST_F(SuiteClass, TestName) \
Expand All @@ -397,7 +415,10 @@ CString libc_make_test_file_path_func(const char *file_name);
void Run() override; \
const char *getName() const override { return #SuiteClass "." #TestName; } \
}; \
DO_PRAGMA_BEGIN \
DO_PRAGMA_BODY \
SuiteClass##_##TestName SuiteClass##_##TestName##_Instance; \
DO_PRAGMA_END \
void SuiteClass##_##TestName::Run()

// Helper to trick the compiler into ignoring lack of braces on the else
Expand Down
Loading