diff options
| author | Anna Zaks <ganna@apple.com> | 2016-09-15 21:02:18 +0000 |
|---|---|---|
| committer | Anna Zaks <ganna@apple.com> | 2016-09-15 21:02:18 +0000 |
| commit | 074767b13f398443ad9fb441120f897997966750 (patch) | |
| tree | 100678ed86288211a44ecc6b53b743c5046e719c /lib/safestack | |
| parent | b5baf5bbfbd0552b2942a7d6494a4eda9eee1854 (diff) | |
[compiler-rt] Do not introduce __sanitizer namespace globally
The definitions in sanitizer_common may conflict with definitions from system headers because:
The runtime includes the system headers after the project headers (as per LLVM coding guidelines).
lib/sanitizer_common/sanitizer_internal_defs.h pollutes the namespace of everything defined after it, which is all/most of the sanitizer .h and .cc files and the included system headers with: using namespace __sanitizer; // NOLINT
This patch solves the problem by introducing the namespace only within the sanitizer namespaces as proposed by Dmitry.
Differential Revision: https://reviews.llvm.org/D21947
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@281657 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/safestack')
| -rw-r--r-- | lib/safestack/safestack.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/safestack/safestack.cc b/lib/safestack/safestack.cc index 92c24b35d..b194b6cfa 100644 --- a/lib/safestack/safestack.cc +++ b/lib/safestack/safestack.cc @@ -92,6 +92,8 @@ static __thread void *unsafe_stack_start = nullptr; static __thread size_t unsafe_stack_size = 0; static __thread size_t unsafe_stack_guard = 0; +using namespace __sanitizer; + static inline void *unsafe_stack_alloc(size_t size, size_t guard) { CHECK_GE(size + guard, size); void *addr = MmapOrDie(size + guard, "unsafe_stack_alloc"); |