diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-04-28 00:56:48 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-04-28 00:56:48 +0000 |
| commit | 144cc5daaaa2cea600098ca838778906cc661a91 (patch) | |
| tree | 579c5ec108859d3778458a75765d94f3b033f5f1 /lib/msan/msan.h | |
| parent | a4fab7d6a7d0cae14d97c15383926f271f294af0 (diff) | |
Allow UBSan+MSan and UBSan+TSan combinations (Clang part).
Embed UBSan runtime into TSan and MSan runtimes in the same as we do
in ASan. Extend UBSan test suite to also run tests for these
combinations.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@235954 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan/msan.h')
| -rw-r--r-- | lib/msan/msan.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/msan/msan.h b/lib/msan/msan.h index f5f87dd0a..2d48e69d7 100644 --- a/lib/msan/msan.h +++ b/lib/msan/msan.h @@ -20,11 +20,16 @@ #include "sanitizer_common/sanitizer_stacktrace.h" #include "msan_interface_internal.h" #include "msan_flags.h" +#include "ubsan/ubsan_platform.h" #ifndef MSAN_REPLACE_OPERATORS_NEW_AND_DELETE # define MSAN_REPLACE_OPERATORS_NEW_AND_DELETE 1 #endif +#ifndef MSAN_CONTAINS_UBSAN +# define MSAN_CONTAINS_UBSAN CAN_SANITIZE_UB +#endif + struct MappingDesc { uptr start; uptr end; |