Skip to content

Commit

Permalink
[Darwin][StableABI][ASan] Remove version mismatch check from stable a…
Browse files Browse the repository at this point in the history
…bi shim

By its nature the stable abi does not require a version check symbol.
This patch sets -asan-guard-against-version-mismatch=0 for stable abi.
And updates tests to reflect this

rdar://114208627

Differential Revision: https://reviews.llvm.org/D158570
  • Loading branch information
thetruestblue committed Aug 24, 2023
1 parent 6579021 commit 7cabb54
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions clang/lib/Driver/SanitizerArgs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,8 @@ void SanitizerArgs::addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
CmdArgs.push_back("-asan-instrumentation-with-call-threshold=0");
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-asan-max-inline-poisoning-size=0");
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-asan-guard-against-version-mismatch=0");
}

// Only pass the option to the frontend if the user requested,
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/asan_abi/asan_abi_shim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void __asan_init(void) {

__asan_abi_init();
}
void __asan_version_mismatch_check_v8(void) {}

void __asan_handle_no_return(void) { __asan_abi_handle_no_return(); }

// Variables concerning RTL state. These provisionally exist for completeness
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// RUN: | grep " [TU] " \
// RUN: | grep -o "\(__asan\)[^ ]*" \
// RUN: | grep -v "\(__asan_abi\)[^ ]*" \
// RUN: | sed -e "s/__asan_version_mismatch_check_v[0-9]+/__asan_version_mismatch_check/" \
// RUN: > %t.exports
// RUN: sed -e ':a' -e 'N' -e '$!ba' \
// RUN: -e 's/ //g' \
Expand All @@ -17,7 +16,9 @@
// RUN: | grep -v -f %p/../../../../lib/asan_abi/asan_abi_tbd.txt \
// RUN: | grep -e "INTERFACE_\(WEAK_\)\?FUNCTION" \
// RUN: | grep -v "__sanitizer[^ ]*" \
// RUN: | sed -e "s/.*(//" -e "s/).*//" > %t.imports
// RUN: | sed -e "s/.*(//" -e "s/).*//" \
// RUN: | sed -e "/^__asan_version_mismatch_check/d" \
// RUN: > %t.imports
// RUN: sort %t.imports | uniq > %t.imports-sorted
// RUN: sort %t.exports | uniq > %t.exports-sorted
// RUN: diff %t.imports-sorted %t.exports-sorted
Expand Down

0 comments on commit 7cabb54

Please sign in to comment.