diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 09:10:30 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 09:10:30 +0000 |
| commit | b6213ab8053fa8feaccef5fbb5bc62279b4b865d (patch) | |
| tree | a9655f4ab60711d5eb7a563c0661e1bbbdd1d3e3 /base/security_unittest.cc | |
| parent | eb35952ae03feaf799ec5e6567990147e223cc3b (diff) | |
| download | chromium_src-b6213ab8053fa8feaccef5fbb5bc62279b4b865d.zip chromium_src-b6213ab8053fa8feaccef5fbb5bc62279b4b865d.tar.gz chromium_src-b6213ab8053fa8feaccef5fbb5bc62279b4b865d.tar.bz2 | |
Revert 226920 "Roll Clang 188423:191856."
I suspect this caused a 25% sizes regression on Mac: http://build.chromium.org/f/chromium/perf/mac-release/sizes/report.html?history=150&rev=-1&graph=Chromium.app
> 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
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/25988002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/security_unittest.cc')
| -rw-r--r-- | base/security_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 8f59219..5b266b0 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -75,11 +75,14 @@ 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. -#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ - defined(THREAD_SANITIZER) || (defined(OS_LINUX) && defined(NO_TCMALLOC)) +// 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)) return true; #else return false; |