Don't link lsan rt if asan or hwasan are enabled

djkoloski · djkoloski · commit 5976494deb02 · 2024-05-15T15:40:53.000Z
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1229,7 +1229,10 @@ fn add_sanitizer_libraries(
     if sanitizer.contains(SanitizerSet::DATAFLOW) {
         link_sanitizer_runtime(sess, flavor, linker, "dfsan");
     }
-    if sanitizer.contains(SanitizerSet::LEAK) {
+    if sanitizer.contains(SanitizerSet::LEAK)
+        && !sanitizer.contains(SanitizerSet::ADDRESS)
+        && !sanitizer.contains(SanitizerSet::HWADDRESS)
+    {
         link_sanitizer_runtime(sess, flavor, linker, "lsan");
     }
     if sanitizer.contains(SanitizerSet::MEMORY) {

Original file line number	Diff line number	Diff line change
`@@ -1229,7 +1229,10 @@ fn add_sanitizer_libraries(`
`1229`	`1229`	`if sanitizer.contains(SanitizerSet::DATAFLOW) {`
`1230`	`1230`	`link_sanitizer_runtime(sess, flavor, linker, "dfsan");`
`1231`	`1231`	`}`
`1232`		`- if sanitizer.contains(SanitizerSet::LEAK) {`
	`1232`	`+ if sanitizer.contains(SanitizerSet::LEAK)`
	`1233`	`+ && !sanitizer.contains(SanitizerSet::ADDRESS)`
	`1234`	`+ && !sanitizer.contains(SanitizerSet::HWADDRESS)`
	`1235`	`+ {`
`1233`	`1236`	`link_sanitizer_runtime(sess, flavor, linker, "lsan");`
`1234`	`1237`	`}`
`1235`	`1238`	`if sanitizer.contains(SanitizerSet::MEMORY) {`