Enable -Wglobal-constructors and -Wexit-time-destructors in Clang builds Chromium disallows static initializers and exit-time destructors across linked libraries. Enable `-Wglobal-constructors` and `-Wexit-time-destructors` via `--per_file_copt` in `.bazelrc` for Clang configurations outside of tests, benchmarks, TSan, and the two allowlisted flag-defining files (`absl/flags/parse.cc` and `absl/log/flags.cc`). Fix the remaining violations by replacing the global `absl::Mutex` in `absl/flags/usage.cc` with `absl::NoDestructor<absl::Mutex>`, deferring `TimerResolution()` initialization in `absl/random/internal/nanobenchmark.cc` to first call, and suppressing `-Wexit-time-destructors` on the intentional `thread_local` thread-exit reclaimer in `absl/base/internal/thread_identity.cc`. PiperOrigin-RevId: 319705387
diff --git a/.bazelrc b/.bazelrc index c64b255..bd30e94 100644 --- a/.bazelrc +++ b/.bazelrc
@@ -46,14 +46,20 @@ common:windows-msvc --config=windows-base +# Disallow static initializers and exit-time destructors outside of tests, +# benchmarks, and the allowlisted flag-defining files. +build:check-static-init --per_file_copt=+^absl/.*\.(cc|h)$,-_test\.(cc|h)$,-_test_[^/]*\.(cc|h)$,-_testing\.h$,-_benchmark\.cc$,-_benchmarks\.cc$,-/benchmarks\.cc$,-^absl/flags/parse\.cc$,-^absl/log/flags\.cc$@-Wglobal-constructors,-Wexit-time-destructors + common:windows-clangcl --config=windows-base build:windows-clangcl --compiler=clang-cl +build:windows-clangcl --config=check-static-init build:windows-clangcl --copt=-Wno-microsoft-cast build:windows-clangcl --extra_execution_platforms=//:x64_windows-clang-cl build:windows-clangcl --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl # Configure our macOS Xcode setup. build:macos --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 +build:macos --config=check-static-init build:macos --copt=-Werror build:macos --copt=-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1 build:macos --features=external_include_paths @@ -62,9 +68,9 @@ build:gcc --config=linux --platforms=//ci:linux_gcc build:gcc-exceptions --config=gcc --copt=-fexceptions -build:clang --config=linux --platforms=//ci:linux_clang --conlyopt=-Wno-unused-command-line-argument +build:clang --config=linux --config=check-static-init --platforms=//ci:linux_clang --conlyopt=-Wno-unused-command-line-argument build:clang-exceptions --config=clang --copt=-fexceptions -build:clang-arm --config=linux --platforms=//ci:linux_arm_clang --conlyopt=-Wno-unused-command-line-argument +build:clang-arm --config=linux --config=check-static-init --platforms=//ci:linux_arm_clang --conlyopt=-Wno-unused-command-line-argument build:libstdc++ --config=clang --features=libstdc++ --copt=-march=haswell # Sanitizer configurations. @@ -81,6 +87,7 @@ build:tsan --config=clang --features=tsan build:tsan --copt=-fno-sanitize-blacklist +build:tsan --per_file_copt=^absl/.*@-Wno-global-constructors,-Wno-exit-time-destructors build:tsan --build_tag_filters=-notsan test:tsan --test_tag_filters=-benchmark,-notsan
diff --git a/absl/base/internal/thread_identity.cc b/absl/base/internal/thread_identity.cc index a9d38d3..d537d8a 100644 --- a/absl/base/internal/thread_identity.cc +++ b/absl/base/internal/thread_identity.cc
@@ -117,8 +117,18 @@ reinterpret_cast<void*>(identity)); thread_identity_ptr = identity; #elif ABSL_THREAD_IDENTITY_MODE == ABSL_THREAD_IDENTITY_MODE_USE_CPP11 + // `holder`'s destructor intentionally reclaims `identity` on thread exit. + // -Wexit-time-destructors was added for Chromium's interests, but this one + // doesn't affect the Chromium build, so we disable this warning. +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wexit-time-destructors" +#endif thread_local std::unique_ptr<ThreadIdentity, ThreadIdentityReclaimerFunction> holder(identity, reclaimer); +#if defined(__clang__) +#pragma clang diagnostic pop +#endif thread_identity_ptr = identity; #else #error Unimplemented ABSL_THREAD_IDENTITY_MODE
diff --git a/absl/flags/BUILD.bazel b/absl/flags/BUILD.bazel index 4dbf975..480aa58 100644 --- a/absl/flags/BUILD.bazel +++ b/absl/flags/BUILD.bazel
@@ -317,6 +317,7 @@ ":usage_internal", "//absl/base:config", "//absl/base:core_headers", + "//absl/base:no_destructor", "//absl/base:raw_logging_internal", "//absl/strings:string_view", "//absl/synchronization",
diff --git a/absl/flags/usage.cc b/absl/flags/usage.cc index 46e7524..d8099b2 100644 --- a/absl/flags/usage.cc +++ b/absl/flags/usage.cc
@@ -14,17 +14,14 @@ // limitations under the License. #include "absl/flags/usage.h" -#include <stdlib.h> - #include <cstdlib> #include <string> #include "absl/base/attributes.h" #include "absl/base/config.h" -#include "absl/base/const_init.h" #include "absl/base/internal/raw_logging.h" +#include "absl/base/no_destructor.h" #include "absl/base/thread_annotations.h" -#include "absl/flags/internal/usage.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" @@ -32,16 +29,23 @@ ABSL_NAMESPACE_BEGIN namespace flags_internal { namespace { -ABSL_CONST_INIT absl::Mutex usage_message_guard(absl::kConstInit); + +absl::Mutex& UsageMessageMutex() { + static absl::NoDestructor<absl::Mutex> mutex; + return *mutex; +} + ABSL_CONST_INIT std::string* program_usage_message - ABSL_GUARDED_BY(usage_message_guard) = nullptr; + ABSL_GUARDED_BY(UsageMessageMutex()) + ABSL_PT_GUARDED_BY(UsageMessageMutex()) = nullptr; + } // namespace } // namespace flags_internal // -------------------------------------------------------------------- // Sets the "usage" message to be used by help reporting routines. void SetProgramUsageMessage(absl::string_view new_usage_message) { - absl::MutexLock l(flags_internal::usage_message_guard); + absl::MutexLock l(flags_internal::UsageMessageMutex()); if (flags_internal::program_usage_message != nullptr) { ABSL_INTERNAL_LOG(FATAL, "SetProgramUsageMessage() called twice."); @@ -56,7 +60,7 @@ // Note: We able to return string_view here only because calling // SetProgramUsageMessage twice is prohibited. absl::string_view ProgramUsageMessage() { - absl::MutexLock l(flags_internal::usage_message_guard); + absl::MutexLock l(flags_internal::UsageMessageMutex()); return flags_internal::program_usage_message != nullptr ? absl::string_view(*flags_internal::program_usage_message)
diff --git a/absl/random/internal/nanobenchmark.cc b/absl/random/internal/nanobenchmark.cc index 08e7f15..db673d9 100644 --- a/absl/random/internal/nanobenchmark.cc +++ b/absl/random/internal/nanobenchmark.cc
@@ -467,7 +467,10 @@ return robust_statistics::Mode(repetitions); } -static const Ticks timer_resolution = TimerResolution(); +Ticks GetTimerResolution() { + static const Ticks timer_resolution = TimerResolution(); + return timer_resolution; +} // Estimates the expected value of "lambda" values with a variable number of // samples until the variability "rel_mad" is less than "max_rel_mad". @@ -494,7 +497,7 @@ // Percentage is too strict for tiny differences, so also allow a small // absolute "median absolute deviation". - const Ticks max_abs_mad = (timer_resolution + 99) / 100; + const Ticks max_abs_mad = (GetTimerResolution() + 99) / 100; *rel_mad = 0.0; // ensure initialized for (size_t eval = 0; eval < p.max_evals; ++eval, samples_per_eval *= 2) { @@ -569,7 +572,7 @@ const Ticks total = SampleUntilStable( p.target_rel_mad, &rel_mad, p, [func, arg, input]() { PreventElision(func(arg, input)); }); - min_duration = (std::min)(min_duration, total - timer_resolution); + min_duration = (std::min)(min_duration, total - GetTimerResolution()); } // Number of repetitions required to reach the target resolution. @@ -579,7 +582,7 @@ min_duration == 0 ? 0 : (max_skip + min_duration - 1) / min_duration; if (p.verbose) { ABSL_RAW_LOG(INFO, "res=%u max_skip=%zu min_dur=%u num_skip=%zu\n", - timer_resolution, max_skip, min_duration, num_skip); + GetTimerResolution(), max_skip, min_duration, num_skip); } return num_skip; }