https://github.com/vitalybuka updated https://github.com/llvm/llvm-project/pull/183646
>From 92317c297c69c2c1136c887e84ec8db2b875cae1 Mon Sep 17 00:00:00 2001 From: Vitaly Buka <[email protected]> Date: Thu, 26 Feb 2026 15:39:44 -0800 Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20change?= =?UTF-8?q?s=20to=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.7 [skip ci] --- clang/lib/Driver/SanitizerArgs.cpp | 6 +++--- clang/test/Driver/fsanitize-minimal-runtime.c | 4 ++++ compiler-rt/test/safestack/overflow.c | 6 ++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 294c9ad2705dc..ce1e971110caf 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -84,9 +84,9 @@ static const SanitizerMask CFIClasses = SanitizerKind::CFIUnrelatedCast; static const SanitizerMask CompatibleWithMinimalRuntime = TrappingSupported | SanitizerKind::Scudo | SanitizerKind::ShadowCallStack | - SanitizerKind::MemtagStack | SanitizerKind::MemtagHeap | - SanitizerKind::MemtagGlobals | SanitizerKind::KCFI | - SanitizerKind::AllocToken; + SanitizerKind::SafeStack | SanitizerKind::MemtagStack | + SanitizerKind::MemtagHeap | SanitizerKind::MemtagGlobals | + SanitizerKind::KCFI | SanitizerKind::AllocToken; enum CoverageFeature { CoverageFunc = 1 << 0, diff --git a/clang/test/Driver/fsanitize-minimal-runtime.c b/clang/test/Driver/fsanitize-minimal-runtime.c index 20a2f8e6c34cd..32714dfb806dd 100644 --- a/clang/test/Driver/fsanitize-minimal-runtime.c +++ b/clang/test/Driver/fsanitize-minimal-runtime.c @@ -87,3 +87,7 @@ // RUN: %clang --target=x86_64-linux-gnu -fsanitize=shadow-call-stack -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCS-MINIMAL // CHECK-SCS-MINIMAL: "-fsanitize=shadow-call-stack" // CHECK-SCS-MINIMAL: "-fsanitize-minimal-runtime" + +// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SAFESTACK-MINIMAL +// CHECK-SAFESTACK-MINIMAL: "-fsanitize=safe-stack" +// CHECK-SAFESTACK-MINIMAL: "-fsanitize-minimal-runtime" diff --git a/compiler-rt/test/safestack/overflow.c b/compiler-rt/test/safestack/overflow.c index baeac1c2afd44..3ef1f78c8d43b 100644 --- a/compiler-rt/test/safestack/overflow.c +++ b/compiler-rt/test/safestack/overflow.c @@ -1,6 +1,12 @@ // RUN: %clang_safestack %s -o %t // RUN: %run %t +// RUN: %clang_safestack -fsanitize-minimal-runtime %s -o %t +// RUN: %run %t + +// RUN: %clang_safestack -fsanitize-minimal-runtime -fsanitize=null %s -o %t +// RUN: %run %t + // RUN: %clang_nosafestack -fno-stack-protector %s -o %t // RUN: not %run %t _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
