Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: build/config/allocator.gni

Issue 2187473005: Revert of Make allocator shim the default for Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/sanitizers/sanitizers.gni") 5 import("//build/config/sanitizers/sanitizers.gni")
6 6
7 # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. 7 # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
8 if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan || 8 if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
9 is_lsan || is_tsan || is_msan || is_win || is_syzyasan || 9 is_lsan || is_tsan || is_msan || is_win || is_syzyasan ||
10 (is_linux && target_cpu == "arm64")) { 10 (is_linux && target_cpu == "arm64")) {
11 _default_allocator = "none" 11 _default_allocator = "none"
12 } else { 12 } else {
13 _default_allocator = "tcmalloc" 13 _default_allocator = "tcmalloc"
14 } 14 }
15 15
16 if ((is_linux || is_android || (is_win && !is_component_build)) && !is_asan && 16 if ((is_linux || is_android) && !is_asan && !is_lsan && !is_tsan && !is_msan) {
17 !is_lsan && !is_tsan && !is_msan) {
18 _default_use_experimental_allocator_shim = true 17 _default_use_experimental_allocator_shim = true
19 } else { 18 } else {
20 _default_use_experimental_allocator_shim = false 19 _default_use_experimental_allocator_shim = false
21 } 20 }
22 21
23 declare_args() { 22 declare_args() {
24 # Memory allocator to use. Set to "none" to use default allocator. 23 # Memory allocator to use. Set to "none" to use default allocator.
25 use_allocator = _default_allocator 24 use_allocator = _default_allocator
26 25
27 # TODO(primiano): this should just become the default without having a flag, 26 # TODO(primiano): this should just become the default without having a flag,
(...skipping 13 matching lines...) Expand all
41 assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") 40 assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
42 41
43 assert( 42 assert(
44 !use_experimental_allocator_shim || is_linux || is_android || is_win, 43 !use_experimental_allocator_shim || is_linux || is_android || is_win,
45 "use_experimental_allocator_shim supported only on Linux, Android and Window s targets") 44 "use_experimental_allocator_shim supported only on Linux, Android and Window s targets")
46 45
47 if (is_win && use_experimental_allocator_shim) { 46 if (is_win && use_experimental_allocator_shim) {
48 assert(!is_component_build, 47 assert(!is_component_build,
49 "The allocator shim doesn't work for the component build on Windows.") 48 "The allocator shim doesn't work for the component build on Windows.")
50 } 49 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698