diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 01:11:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 01:11:37 +0000 |
| commit | d19d40d46917d7f347d1acd1517d162fb080755e (patch) | |
| tree | b6c40b348fb2367670046cbcd41bba1fbd10cc82 /base/security_unittest.cc | |
| parent | bece1565f412f065e73448c5e337dbb76b33bf96 (diff) | |
| download | chromium_src-d19d40d46917d7f347d1acd1517d162fb080755e.zip chromium_src-d19d40d46917d7f347d1acd1517d162fb080755e.tar.gz chromium_src-d19d40d46917d7f347d1acd1517d162fb080755e.tar.bz2 | |
Roll Clang 188423:191856.
Remove libprofile_rt from package.sh, it doesn't exist after LLVM r191835
BUG=290204,303886
R=thakis@chromium.org
TBR=net owner
NOTRY=true
Review URL: https://codereview.chromium.org/25875004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/security_unittest.cc')
| -rw-r--r-- | base/security_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 5b266b0..8f59219 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -75,14 +75,11 @@ bool IsTcMallocBypassed() { } bool CallocDiesOnOOM() { +// The sanitizers' calloc dies on OOM instead of returning NULL. // The wrapper function in base/process_util_linux.cc that is used when we // compile without TCMalloc will just die on OOM instead of returning NULL. -// This function is explicitly disabled if we compile with AddressSanitizer, -// MemorySanitizer or ThreadSanitizer. -#if defined(OS_LINUX) && defined(NO_TCMALLOC) && \ - (!defined(ADDRESS_SANITIZER) && \ - !defined(MEMORY_SANITIZER) && \ - !defined(THREAD_SANITIZER)) +#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ + defined(THREAD_SANITIZER) || (defined(OS_LINUX) && defined(NO_TCMALLOC)) return true; #else return false; |