[llvm-branch-commits] [llvm] [msan] Enable -msan-with-comdat by default on COMDAT targets (PR #238678)

Vitaly Buka via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Tue Nov 3 22:24:47 PST 2026


https://github.com/vitalybuka updated https://github.com/llvm/llvm-project/pull/238678

>From ea7f0a1a8de71c2110b7216cb67f39a173040708 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Tue, 3 Nov 2026 21:53:33 -0800
Subject: [PATCH] [spr] update

Created using spr 2.0.0-beta.2
---
 llvm/lib/Transforms/Instrumentation/InstrumentationOptions.td | 4 +---
 llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp       | 2 +-
 llvm/test/Instrumentation/MemorySanitizer/comdat_ctor.ll      | 4 ++--
 .../Instrumentation/MemorySanitizer/msan-pass-second-run.ll   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/llvm/lib/Transforms/Instrumentation/InstrumentationOptions.td b/llvm/lib/Transforms/Instrumentation/InstrumentationOptions.td
index 046d9d28041100..b26a8c1b6ab317 100644
--- a/llvm/lib/Transforms/Instrumentation/InstrumentationOptions.td
+++ b/llvm/lib/Transforms/Instrumentation/InstrumentationOptions.td
@@ -505,9 +505,7 @@ defm : ValueField<"msan-switch-precision", "int", "99",
 // or heap) the uninitialized bits came from originally.
 defm : OptionalValueField<"msan-track-origins", "int",
   "Track origins (allocation sites) of poisoned memory">;
-// This is off by default because of a bug in gold:
-// https://sourceware.org/bugzilla/show_bug.cgi?id=19002
-defm : BoolField<"msan-with-comdat", "false",
+defm : BoolField<"msan-with-comdat", "true",
   "Place MSan constructors in comdat sections">;
 defm : ValueField<"msan-xor-mask", "uint64_t", "0",
   "Define custom MSan XorMask">;
diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
index 3a7f3722b8afe2..f8c51fe4d41108 100644
--- a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -580,7 +580,7 @@ void insertModuleCtor(const InstrumentationOptions &Opts, Module &M) {
       // This callback is invoked when the functions are created the first
       // time. Hook them into the global ctors list in that case:
       [&](Function *Ctor, FunctionCallee) {
-        if (!Opts.msan_with_comdat) {
+        if (!Opts.msan_with_comdat || !M.getTargetTriple().supportsCOMDAT()) {
           appendToGlobalCtors(M, Ctor, 0);
           return;
         }
diff --git a/llvm/test/Instrumentation/MemorySanitizer/comdat_ctor.ll b/llvm/test/Instrumentation/MemorySanitizer/comdat_ctor.ll
index 77dffd67cf62a1..c838ca73fcea27 100644
--- a/llvm/test/Instrumentation/MemorySanitizer/comdat_ctor.ll
+++ b/llvm/test/Instrumentation/MemorySanitizer/comdat_ctor.ll
@@ -10,7 +10,7 @@ define void @f() {
 }
 ;.
 ; CHECK: @llvm.used = appending global [1 x ptr] [ptr @msan.module_ctor], section "llvm.metadata"
-; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 0, ptr @msan.module_ctor, ptr null }]
+; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 0, ptr @msan.module_ctor, ptr @msan.module_ctor }]
 ; CHECK: @__msan_retval_tls = external thread_local(initialexec) global [100 x i64]
 ; CHECK: @__msan_retval_origin_tls = external thread_local(initialexec) global i32
 ; CHECK: @__msan_param_tls = external thread_local(initialexec) global [100 x i64]
@@ -35,7 +35,7 @@ define void @f() {
 ;
 ;
 ; CHECK-LABEL: define internal void @msan.module_ctor(
-; CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
+; CHECK-SAME: ) #[[ATTR0:[0-9]+]] comdat {
 ; CHECK-NEXT:    call void @__msan_init()
 ; CHECK-NEXT:    ret void
 ;
diff --git a/llvm/test/Instrumentation/MemorySanitizer/msan-pass-second-run.ll b/llvm/test/Instrumentation/MemorySanitizer/msan-pass-second-run.ll
index c4d5927e4a7f42..865e03014a586c 100644
--- a/llvm/test/Instrumentation/MemorySanitizer/msan-pass-second-run.ll
+++ b/llvm/test/Instrumentation/MemorySanitizer/msan-pass-second-run.ll
@@ -7,7 +7,7 @@ target triple = "x86_64-unknown-linux-gnu"
 
 ;.
 ; CHECK: @llvm.used = appending global [1 x ptr] [ptr @msan.module_ctor], section "llvm.metadata"
-; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 0, ptr @msan.module_ctor, ptr null }]
+; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 0, ptr @msan.module_ctor, ptr @msan.module_ctor }]
 ; CHECK: @__msan_retval_tls = external thread_local(initialexec) global [100 x i64]
 ; CHECK: @__msan_retval_origin_tls = external thread_local(initialexec) global i32
 ; CHECK: @__msan_param_tls = external thread_local(initialexec) global [100 x i64]



More information about the llvm-branch-commits mailing list