diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-04-22 18:43:15 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-04-22 18:43:15 +0000 |
| commit | 289fa303d6df65b9db955e478263677f8bc7e62a (patch) | |
| tree | a13c0c7f6575c19340f22eadcb8e9165ea6dc841 /contrib/compiler-rt/lib/asan/asan_interceptors.cc | |
| parent | d0338a294d7c83730952e980a3866f54a6d4ad3c (diff) | |
| parent | f351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d (diff) | |
Merge compiler-rt trunk r300890, and update build glue.
Notes
Notes:
svn path=/projects/clang500-import/; revision=317285
Diffstat (limited to 'contrib/compiler-rt/lib/asan/asan_interceptors.cc')
| -rw-r--r-- | contrib/compiler-rt/lib/asan/asan_interceptors.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/compiler-rt/lib/asan/asan_interceptors.cc b/contrib/compiler-rt/lib/asan/asan_interceptors.cc index 606016d4f4d3..6ee3266062f8 100644 --- a/contrib/compiler-rt/lib/asan/asan_interceptors.cc +++ b/contrib/compiler-rt/lib/asan/asan_interceptors.cc @@ -228,9 +228,11 @@ DECLARE_REAL_AND_INTERCEPTOR(void, free, void *) // Strict init-order checking is dlopen-hostile: // https://github.com/google/sanitizers/issues/178 #define COMMON_INTERCEPTOR_ON_DLOPEN(filename, flag) \ - if (flags()->strict_init_order) { \ - StopInitOrderChecking(); \ - } + do { \ + if (flags()->strict_init_order) \ + StopInitOrderChecking(); \ + CheckNoDeepBind(filename, flag); \ + } while (false) #define COMMON_INTERCEPTOR_ON_EXIT(ctx) OnExit() #define COMMON_INTERCEPTOR_LIBRARY_LOADED(filename, handle) \ CoverageUpdateMapping() |