Bug 1347796 - Bump stack size 3x larger than default for win64 ASan. r?dbaron,gps draft
authorTing-Yu Chou <janus926@gmail.com>
Mon, 20 Mar 2017 10:52:00 +0800
changeset 503374 5d57c9c6cc185dc9c15460a36593aef3385a4adc
parent 501295 1b9293be51637f841275541d8991314ca56561a5
child 550410 922e329371e6760b9c1697c2d9a94a0d848b0f73
push id50560
push userbmo:janus926@gmail.com
push dateThu, 23 Mar 2017 05:36:16 +0000
reviewersdbaron, gps
bugs1347796, 582910, 1259796
milestone55.0a1
Bug 1347796 - Bump stack size 3x larger than default for win64 ASan. r?dbaron,gps This is a similar issue to bug 582910 which the stack isn't big enough to run the tests that recurse deeply. Set it 3x larger because the offical site states they've seen up to 3x stack memory increase for ASan, also the number was confirmed by the measurements in bug 1259796. MozReview-Commit-ID: FLASlkVrEUM
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -408,20 +408,25 @@ endif
 else
 # For setting subsystem version
 WIN32_EXE_LDFLAGS	+= $(WIN32_CONSOLE_EXE_LDFLAGS)
 endif
 endif # WINNT
 
 ifdef _MSC_VER
 ifeq ($(CPU_ARCH),x86_64)
+ifdef MOZ_ASAN
+# ASan could have 3x stack memory usage of normal builds.
+WIN32_EXE_LDFLAGS	+= -STACK:6291456
+else
 # set stack to 2MB on x64 build.  See bug 582910
 WIN32_EXE_LDFLAGS	+= -STACK:2097152
 endif
 endif
+endif
 
 #
 # Include any personal overrides the user might think are needed.
 #
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
 -include $(MY_CONFIG)
 
 ######################################################################