diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-02-21 13:53:12 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-02-21 13:53:12 +0000 |
| commit | c003a57e2e4a1ad9be0338806bc1038b6987155f (patch) | |
| tree | cf295e125457815f2b478811e8414810b8ed7c14 /lib/msan | |
| parent | 48f79c11890f23f47fbe89ec54a57d5cd485a7b1 (diff) | |
| download | src-c003a57e2e4a1ad9be0338806bc1038b6987155f.tar.gz src-c003a57e2e4a1ad9be0338806bc1038b6987155f.zip | |
Vendor import of compiler-rt release_38 branch r261369:vendor/compiler-rt/compiler-rt-release_380-r262564vendor/compiler-rt/compiler-rt-release_38-r261369
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=295850
svn path=/vendor/compiler-rt/compiler-rt-release_380-r262564/; revision=296362; tag=vendor/compiler-rt/compiler-rt-release_380-r262564
Diffstat (limited to 'lib/msan')
| -rw-r--r-- | lib/msan/msan_interceptors.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index fc28e080f262..0db2ac5b226c 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -1408,12 +1408,12 @@ int OnExit() { __msan_unpoison(ptr, size) #define COMMON_INTERCEPTOR_ENTER(ctx, func, ...) \ if (msan_init_is_running) return REAL(func)(__VA_ARGS__); \ + ENSURE_MSAN_INITED(); \ MSanInterceptorContext msan_ctx = {IsInInterceptorScope()}; \ ctx = (void *)&msan_ctx; \ (void)ctx; \ InterceptorScope interceptor_scope; \ - __msan_unpoison(__errno_location(), sizeof(int)); /* NOLINT */ \ - ENSURE_MSAN_INITED(); + __msan_unpoison(__errno_location(), sizeof(int)); /* NOLINT */ #define COMMON_INTERCEPTOR_DIR_ACQUIRE(ctx, path) \ do { \ } while (false) |