[NFC][Driver][CFI] Update boolean expression (#135881)

vitalybuka · web-flow · commit 2e9ab7cf96d8 · 2025-04-16T08:09:34.000-07:00
Show why we don't need regular CFI runtime, when CFI diag runtime is
linked.
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp
@@ -371,8 +371,7 @@ bool SanitizerArgs::needsUbsanCXXRt() const {
 }
 
 bool SanitizerArgs::needsCfiRt() const {
-  return !(Sanitizers.Mask & SanitizerKind::CFI & ~TrapSanitizers.Mask) &&
-         CfiCrossDso && !ImplicitCfiRuntime;
+  return !needsCfiDiagRt() && CfiCrossDso && !ImplicitCfiRuntime;
 }
 
 bool SanitizerArgs::needsCfiDiagRt() const {

Original file line number	Diff line number	Diff line change
`@@ -371,8 +371,7 @@ bool SanitizerArgs::needsUbsanCXXRt() const {`
`371`	`371`	`}`
`372`	`372`
`373`	`373`	`bool SanitizerArgs::needsCfiRt() const {`
`374`		`- return !(Sanitizers.Mask & SanitizerKind::CFI & ~TrapSanitizers.Mask) &&`
`375`		`- CfiCrossDso && !ImplicitCfiRuntime;`
	`374`	`+ return !needsCfiDiagRt() && CfiCrossDso && !ImplicitCfiRuntime;`
`376`	`375`	`}`
`377`	`376`
`378`	`377`	`bool SanitizerArgs::needsCfiDiagRt() const {`