diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 18:08:45 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 18:08:45 +0000 |
| commit | 8e0f32c0f13b45ca7553e268f2f9db00a44c3b40 (patch) | |
| tree | b8a83bed54c6629e75d54262be8334d8ca3d6190 /base | |
| parent | 0fdf268ee945968dfa81e44ec017030add608613 (diff) | |
| download | chromium_src-8e0f32c0f13b45ca7553e268f2f9db00a44c3b40.zip chromium_src-8e0f32c0f13b45ca7553e268f2f9db00a44c3b40.tar.gz chromium_src-8e0f32c0f13b45ca7553e268f2f9db00a44c3b40.tar.bz2 | |
Fix a compilation error caused by some variables being unused under ASan on Mac.
Review URL: https://chromiumcodereview.appspot.com/10536173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_mac.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index 0c6847b..1ac30fe 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -878,6 +878,10 @@ void EnableTerminationOnOutOfMemory() { !g_old_valloc_purgeable && !g_old_realloc_purgeable && !g_old_memalign_purgeable) << "Old allocators unexpectedly non-null"; +#if !defined(ADDRESS_SANITIZER) + // Don't do anything special on OOM for the malloc zones replaced by + // AddressSanitizer, as modifying or protecting them may not work correctly. + // See http://trac.webkit.org/changeset/53362/trunk/Tools/DumpRenderTree/mac bool zone_allocators_protected = base::mac::IsOSLionOrLater(); @@ -886,9 +890,6 @@ void EnableTerminationOnOutOfMemory() { ChromeMallocZone* purgeable_zone = reinterpret_cast<ChromeMallocZone*>(GetPurgeableZone()); -#ifndef ADDRESS_SANITIZER - // Don't do anything special on OOM for the malloc zones replaced by - // AddressSanitizer, as modifying or protecting them may not work correctly. vm_address_t page_start_default = 0; vm_address_t page_start_purgeable = 0; vm_size_t len_default = 0; |