From 87da2f7957c9d2afecbe25e7ffbb1fc46d6062c9 Mon Sep 17 00:00:00 2001 From: danakj Date: Tue, 29 Oct 2024 20:19:29 +0000 Subject: [PATCH] Set Rust symbol visibility to hidden when C++ symbols are This depended on https://github.com/rust-lang/rust/pull/131519 rolling into the Rust compiler to fix builtins/intrinisics, which was merged in 33b1264540b. Remove ASAN ODR exceptions for Rust globals as they are no longer walked twice incorrectly when they are hidden. Disable the rust logging test in component builds for all platforms not just for Windows, now that symbol visibility is the same for all platforms. See https://crbug.com/374023535#comment13 Bug: 41484256, 40274892, 374023535 Fixed: 40278279 Cq-Include-Trybots: luci.chromium.try:linux-official,mac-official,win-official,win32-official Cq-Include-Trybots: luci.chromium.try:linux-asan-rel,mac-asan-rel,win-asan-rel Cq-Include-Trybots: luci.chromium.try:linux_chromium_dbg_ng Change-Id: I976ef679961e9db5a91bcc74f559ebbcc0bf058b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5966273 Commit-Queue: danakj Reviewed-by: Arthur Eubanks Cr-Commit-Position: refs/heads/main@{#1375460} NOKEYCHECK=True GitOrigin-RevId: ee3900fd57b3c580aefff15c64052904d81b7760 --- logging/rust_log_integration_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logging/rust_log_integration_unittest.cc b/logging/rust_log_integration_unittest.cc index 6d0d9c949e..142d8f9e28 100644 --- a/logging/rust_log_integration_unittest.cc +++ b/logging/rust_log_integration_unittest.cc @@ -20,8 +20,8 @@ class RustLogIntegrationTest : public testing::Test { base::test::MockLog log_; }; -// TODO(crbug.com/374023535): Re-enable test. -#if BUILDFLAG(IS_WIN) && !defined(NDEBUG) +// TODO(crbug.com/374023535): Logging does not work in component builds. +#if defined(COMPONENT_BUILD) #define MAYBE_CheckAllSeverity DISABLED_CheckAllSeverity #else #define MAYBE_CheckAllSeverity CheckAllSeverity