diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 19:51:17 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 19:51:17 +0000 |
| commit | eb82dfb5b79beff139348b435122a61d7a99adc6 (patch) | |
| tree | c2cfc9866c23006a30f028f69af4d3eefcc6ded3 /base | |
| parent | 98e22460feffee2a7a9b162b0ba0ca9d6c2d2d34 (diff) | |
| download | chromium_src-eb82dfb5b79beff139348b435122a61d7a99adc6.zip chromium_src-eb82dfb5b79beff139348b435122a61d7a99adc6.tar.gz chromium_src-eb82dfb5b79beff139348b435122a61d7a99adc6.tar.bz2 | |
Include the MSan interface header in base/compiler_specific.h.
Since that header is now available in Chrome, we can include it instead of
re-defining the interface. Also, the definition of __msan_unpoison() in
base/compiler_specific.h conflicted with the definition in
sanitizer/msan_interface.h, preventing us from including the interface header
anywhere (e.g. during debugging).
BUG=178409
R=eugenis@chromium.org, mark@chromium.org
Review URL: https://codereview.chromium.org/132913011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/compiler_specific.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/base/compiler_specific.h b/base/compiler_specific.h index fa99831..4d0d19a 100644 --- a/base/compiler_specific.h +++ b/base/compiler_specific.h @@ -199,9 +199,7 @@ // MemorySanitizer annotations. #ifdef MEMORY_SANITIZER -extern "C" { -void __msan_unpoison(const void *p, unsigned long s); -} // extern "C" +#include <sanitizer/msan_interface.h> // Mark a memory region fully initialized. // Use this to annotate code that deliberately reads uninitialized data, for |