[clang] [NFC][Drive] Reorder boolean expression (PR #135881)

2025-04-15 Thread Florian Mayer via cfe-commits 

https://github.com/fmayer approved this pull request.

nit: Driver

nit2: I don't think this is really reordering.

https://github.com/llvm/llvm-project/pull/135881
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [NFC][Drive] Reorder boolean expression (PR #135881)

2025-04-15 Thread via cfe-commits 

llvmbot wrote:




@llvm/pr-subscribers-clang

Author: Vitaly Buka (vitalybuka)


Changes

Show why we don't need regular CFI runtime, if CFI diag is linked.


---
Full diff: https://github.com/llvm/llvm-project/pull/135881.diff


1 Files Affected:

- (modified) clang/lib/Driver/SanitizerArgs.cpp (+1-2) 


``diff
diff --git a/clang/lib/Driver/SanitizerArgs.cpp 
b/clang/lib/Driver/SanitizerArgs.cpp
index 3c7cd562a14e3..1db9da1b60939 100644
--- 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 {

``




https://github.com/llvm/llvm-project/pull/135881
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [NFC][Drive] Reorder boolean expression (PR #135881)

2025-04-15 Thread Vitaly Buka via cfe-commits 

https://github.com/vitalybuka created 
https://github.com/llvm/llvm-project/pull/135881

Show why we don't need regular CFI runtime, if CFI diag is linked.


>From 4e34bfe6d216142fb712dafe04c266c3ca4f7424 Mon Sep 17 00:00:00 2001
From: Vitaly Buka 
Date: Tue, 15 Apr 2025 16:28:57 -0700
Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?=
 =?UTF-8?q?l=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Created using spr 1.3.4
---
 clang/lib/Driver/SanitizerArgs.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/clang/lib/Driver/SanitizerArgs.cpp 
b/clang/lib/Driver/SanitizerArgs.cpp
index 3c7cd562a14e3..1db9da1b60939 100644
--- 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 {

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits