https://github.com/Sharjeel-Khan updated
https://github.com/llvm/llvm-project/pull/122540
>From c8d2c210a98fe0c96d758d538d50fcc0ca61a9ff Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelk...@google.com>
Date: Fri, 10 Jan 2025 20:07:52 +0000
Subject: [PATCH 1/3] Warn when using msan on Android
Msan is not supported on Android as mentioned in google/sanitizers#1381.
We proactively give the warning saying it is unsupported to fix
android/ndk#1958.
---
clang/lib/Driver/SanitizerArgs.cpp | 10 ++++++++++
clang/test/Driver/fsanitize.c | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/clang/lib/Driver/SanitizerArgs.cpp
b/clang/lib/Driver/SanitizerArgs.cpp
index a0d6919c6dc8d0..04b39d29e7342f 100644
--- a/clang/lib/Driver/SanitizerArgs.cpp
+++ b/clang/lib/Driver/SanitizerArgs.cpp
@@ -530,6 +530,16 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
}
Add &= Supported;
+ // Msan is not supported on Android
+ if ((Add & SanitizerKind::Memory) && TC.getTriple().isAndroid()) {
+ if (DiagnoseErrors) {
+ D.Diag(diag::warn_drv_unsupported_option_for_target)
+ << "-fsanitize=memory" << Triple.str();
+ }
+ DiagnosedKinds |= SanitizerKind::Memory;
+ Add &= ~SanitizerKind::Memory;
+ }
+
// Test for -fno-rtti + explicit -fsanitizer=vptr before expanding groups
// so we don't error out if -fno-rtti and -fsanitize=undefined were
// passed.
diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
index 1d3caec748d77a..55b51ed29b0e65 100644
--- a/clang/test/Driver/fsanitize.c
+++ b/clang/test/Driver/fsanitize.c
@@ -399,6 +399,11 @@
// RUN: %clang --target=arm-linux-androideabi %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-ANDROID-NO-ASAN
// CHECK-ANDROID-NO-ASAN: "-mrelocation-model" "pic"
+// RUN: %clang --target=aarch64-linux-android -fsanitize=memory %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
+// RUN: %clang --target=i386-linux-android -fsanitize=memory %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
+// RUN: %clang --target=x86_64-linux-android -fsanitize=memory %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
+// CHECK-MSAN-ANDROID: ignoring '-fsanitize=memory' option as it is not
currently supported for target
+
// RUN: %clang --target=x86_64-linux-gnu %s -fsanitize=undefined -### 2>&1 |
FileCheck %s --check-prefix=CHECK-RECOVER-UBSAN
// RUN: %clang --target=x86_64-linux-gnu %s -fsanitize=undefined
-fsanitize-recover -### 2>&1 | FileCheck %s --check-prefix=CHECK-RECOVER-UBSAN
// RUN: %clang --target=x86_64-linux-gnu %s -fsanitize=undefined
-fsanitize-recover=all -### 2>&1 | FileCheck %s
--check-prefix=CHECK-RECOVER-UBSAN
>From 035c7d9936a33926ccca10d9670879d3b913496e Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelk...@google.com>
Date: Fri, 10 Jan 2025 22:31:33 +0000
Subject: [PATCH 2/3] Fixed format for SanitizerArgs
---
clang/lib/Driver/SanitizerArgs.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/lib/Driver/SanitizerArgs.cpp
b/clang/lib/Driver/SanitizerArgs.cpp
index 04b39d29e7342f..25bfd5eadae8c9 100644
--- a/clang/lib/Driver/SanitizerArgs.cpp
+++ b/clang/lib/Driver/SanitizerArgs.cpp
@@ -534,7 +534,7 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
if ((Add & SanitizerKind::Memory) && TC.getTriple().isAndroid()) {
if (DiagnoseErrors) {
D.Diag(diag::warn_drv_unsupported_option_for_target)
- << "-fsanitize=memory" << Triple.str();
+ << "-fsanitize=memory" << Triple.str();
}
DiagnosedKinds |= SanitizerKind::Memory;
Add &= ~SanitizerKind::Memory;
>From 3e42b05457a735365ef8e17c4da8e8d3a530c607 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelk...@google.com>
Date: Sat, 11 Jan 2025 20:50:28 +0000
Subject: [PATCH 3/3] Move the check into Linux.cpp
---
clang/lib/Driver/SanitizerArgs.cpp | 10 ----------
clang/lib/Driver/ToolChains/Linux.cpp | 4 +++-
clang/test/Driver/fsanitize.c | 8 ++++----
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/clang/lib/Driver/SanitizerArgs.cpp
b/clang/lib/Driver/SanitizerArgs.cpp
index 25bfd5eadae8c9..a0d6919c6dc8d0 100644
--- a/clang/lib/Driver/SanitizerArgs.cpp
+++ b/clang/lib/Driver/SanitizerArgs.cpp
@@ -530,16 +530,6 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
}
Add &= Supported;
- // Msan is not supported on Android
- if ((Add & SanitizerKind::Memory) && TC.getTriple().isAndroid()) {
- if (DiagnoseErrors) {
- D.Diag(diag::warn_drv_unsupported_option_for_target)
- << "-fsanitize=memory" << Triple.str();
- }
- DiagnosedKinds |= SanitizerKind::Memory;
- Add &= ~SanitizerKind::Memory;
- }
-
// Test for -fno-rtti + explicit -fsanitizer=vptr before expanding groups
// so we don't error out if -fno-rtti and -fsanitize=undefined were
// passed.
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp
b/clang/lib/Driver/ToolChains/Linux.cpp
index 1c56355136df86..c2a85be8198169 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -823,6 +823,7 @@ SanitizerMask Linux::getSupportedSanitizers() const {
const bool IsRISCV64 = getTriple().getArch() == llvm::Triple::riscv64;
const bool IsSystemZ = getTriple().getArch() == llvm::Triple::systemz;
const bool IsHexagon = getTriple().getArch() == llvm::Triple::hexagon;
+ const bool IsAndroid = getTriple().isAndroid();
SanitizerMask Res = ToolChain::getSupportedSanitizers();
Res |= SanitizerKind::Address;
Res |= SanitizerKind::PointerCompare;
@@ -831,7 +832,6 @@ SanitizerMask Linux::getSupportedSanitizers() const {
Res |= SanitizerKind::Fuzzer;
Res |= SanitizerKind::FuzzerNoLink;
Res |= SanitizerKind::KernelAddress;
- Res |= SanitizerKind::Memory;
Res |= SanitizerKind::Vptr;
Res |= SanitizerKind::SafeStack;
if (IsX86_64 || IsMIPS64 || IsAArch64 || IsLoongArch64)
@@ -857,6 +857,8 @@ SanitizerMask Linux::getSupportedSanitizers() const {
}
if (IsX86_64)
Res |= SanitizerKind::NumericalStability;
+ if (!IsAndroid)
+ Res |= SanitizerKind::Memory;
// Work around "Cannot represent a difference across sections".
if (getTriple().getArch() == llvm::Triple::ppc64)
diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
index 55b51ed29b0e65..429dc51b3356d6 100644
--- a/clang/test/Driver/fsanitize.c
+++ b/clang/test/Driver/fsanitize.c
@@ -399,10 +399,10 @@
// RUN: %clang --target=arm-linux-androideabi %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-ANDROID-NO-ASAN
// CHECK-ANDROID-NO-ASAN: "-mrelocation-model" "pic"
-// RUN: %clang --target=aarch64-linux-android -fsanitize=memory %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
-// RUN: %clang --target=i386-linux-android -fsanitize=memory %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
-// RUN: %clang --target=x86_64-linux-android -fsanitize=memory %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
-// CHECK-MSAN-ANDROID: ignoring '-fsanitize=memory' option as it is not
currently supported for target
+// RUN: not %clang --target=aarch64-linux-android -fsanitize=memory %s -###
2>&1 | FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
+// RUN: not %clang --target=i386-linux-android -fsanitize=memory %s -### 2>&1
| FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
+// RUN: not %clang --target=x86_64-linux-android -fsanitize=memory %s -###
2>&1 | FileCheck %s --check-prefix=CHECK-MSAN-ANDROID
+// CHECK-MSAN-ANDROID: unsupported option '-fsanitize=memory' for target
// RUN: %clang --target=x86_64-linux-gnu %s -fsanitize=undefined -### 2>&1 |
FileCheck %s --check-prefix=CHECK-RECOVER-UBSAN
// RUN: %clang --target=x86_64-linux-gnu %s -fsanitize=undefined
-fsanitize-recover -### 2>&1 | FileCheck %s --check-prefix=CHECK-RECOVER-UBSAN
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
