Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ece2a2b
do not asan-instrument catch parameters on windows
davidmrdavid Sep 18, 2025
bff409d
add basic unit test: catches exception 'inline' and in another frame
davidmrdavid Sep 18, 2025
043848d
apply clang-format on `compiler-rt/test/asan/TestCases/Windows/basic_…
davidmrdavid Sep 18, 2025
2326be0
optimization: disable catch-parameter instrumentation via a linear pa…
davidmrdavid Sep 23, 2025
3497540
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Sep 23, 2025
e4551b1
add IR instrumentation unit test with `opt`
davidmrdavid Oct 13, 2025
9b99935
Merge branch 'dev/dajusto/dont-asanize-catch-params-on-windows' of ht…
davidmrdavid Oct 13, 2025
04956f9
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Oct 13, 2025
65f1741
remove unecessary braces in if-statement
davidmrdavid Oct 14, 2025
fe312ec
minimize `.ll` test
davidmrdavid Oct 14, 2025
a44a340
Merge branch 'dev/dajusto/dont-asanize-catch-params-on-windows' of ht…
davidmrdavid Oct 14, 2025
bd511b5
remove braces from the 'for' loop
davidmrdavid Oct 14, 2025
c5a0e78
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Oct 14, 2025
992a650
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Oct 14, 2025
0dec61a
Update llvm/test/Instrumentation/AddressSanitizer/asan-win-dont-instr…
davidmrdavid Oct 17, 2025
112f078
Update llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
davidmrdavid Oct 17, 2025
2f544df
add newline to runtime test
davidmrdavid Oct 17, 2025
980e31d
follow convention: move lit commands to start of backend unit test
davidmrdavid Oct 17, 2025
7d93177
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Oct 17, 2025
7fe17b5
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Oct 17, 2025
98217a4
Update llvm/test/Instrumentation/AddressSanitizer/asan-win-dont-instr…
davidmrdavid Oct 17, 2025
4b88967
Merge branch 'main' into dev/dajusto/dont-asanize-catch-params-on-win…
davidmrdavid Oct 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// RUN: %clangxx_asan %s -o %t
// RUN: %run %t | FileCheck %s

// This test tests that declaring a parameter in a catch-block does not produce a false positive
// ASan error on Windows.

// This code is based on the repro in https://github.com/google/sanitizers/issues/749
#include <cstdio>
#include <exception>

void throwInFunction() { throw std::exception("test2"); }

int main() {
// case 1: direct throw
try {
throw std::exception("test1");
} catch (const std::exception &ex) {
puts(ex.what());
// CHECK: test1
}

// case 2: throw in function
try {
throwInFunction();
} catch (const std::exception &ex) {
puts(ex.what());
// CHECK: test2
}

printf("Success!\n");
// CHECK: Success!
return 0;
}
22 changes: 22 additions & 0 deletions llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,7 @@ struct AddressSanitizer {
bool maybeInsertAsanInitAtFunctionEntry(Function &F);
bool maybeInsertDynamicShadowAtFunctionEntry(Function &F);
void markEscapedLocalAllocas(Function &F);
void markCatchParametersAsUninteresting(Function &F);

private:
friend struct FunctionStackPoisoner;
Expand Down Expand Up @@ -2986,6 +2987,24 @@ void AddressSanitizer::markEscapedLocalAllocas(Function &F) {
}
}
}
// Mitigation for https://github.com/google/sanitizers/issues/749
// We don't instrument Windows catch-block parameters to avoid
// interfering with exception handling assumptions.
void AddressSanitizer::markCatchParametersAsUninteresting(Function &F) {
for (BasicBlock &BB : F) {
for (Instruction &I : BB) {
if (auto *CatchPad = dyn_cast<CatchPadInst>(&I)) {
// Mark the parameters to a catch-block as uninteresting to avoid
// instrumenting them
for (Value *Operand : CatchPad->arg_operands()) {
if (auto *AI = dyn_cast<AllocaInst>(Operand)) {
ProcessedAllocas[AI] = false;
}
}
}
}
}
}

bool AddressSanitizer::suppressInstrumentationSiteForDebug(int &Instrumented) {
bool ShouldInstrument =
Expand Down Expand Up @@ -3030,6 +3049,9 @@ bool AddressSanitizer::instrumentFunction(Function &F,
// can be passed to that intrinsic.
markEscapedLocalAllocas(F);

if (TargetTriple.isOSWindows())
markCatchParametersAsUninteresting(F);

// We want to instrument every address only once per basic block (unless there
// are calls between uses).
SmallPtrSet<Value *, 16> TempsToInstrument;
Expand Down