Bug 1536575 - Stack size on aarch64 Windows should match stack size on x86_64 Windows. r=glandium a=pascalc
authorHenri Sivonen <hsivonen@hsivonen.fi>
Tue, 09 Apr 2019 08:15:24 +0000
changeset 526111 611f3e691f0b918b449e7a1717d08d20e7b509f9
parent 526110 59dcec156ac92fac1b57e640a2e3222df604aa4e
child 526112 480b514d559f1036f6f51b7bca8c0652706df31b
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, pascalc
bugs1536575
milestone67.0
Bug 1536575 - Stack size on aarch64 Windows should match stack size on x86_64 Windows. r=glandium a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D26272
config/config.mk
layout/reftests/bugs/reftest.list
--- a/config/config.mk
+++ b/config/config.mk
@@ -285,17 +285,17 @@ WIN32_EXE_LDFLAGS	+= $(WIN32_GUI_EXE_LDF
 endif
 else
 # For setting subsystem version
 WIN32_EXE_LDFLAGS	+= $(WIN32_CONSOLE_EXE_LDFLAGS)
 endif
 endif # WINNT
 
 ifneq (,$(filter msvc clang-cl,$(CC_TYPE)))
-ifeq ($(CPU_ARCH),x86_64)
+ifneq ($(CPU_ARCH),x86)
 # Normal operation on 64-bit Windows needs 2 MB of stack. (Bug 582910)
 # ASAN requires 6 MB of stack.
 # Setting the stack to 8 MB to match the capability of other systems
 # to deal with frame construction for unreasonably deep DOM trees
 # with worst-case styling. This uses address space unnecessarily for
 # non-main threads, but that should be tolerable on 64-bit systems.
 # (Bug 256180)
 WIN32_EXE_LDFLAGS      += -STACK:8388608
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -35,23 +35,23 @@
 == 18217-zorder-3.html 18217-zorder-ref-inline.html
 == 18217-zorder-4.html 18217-zorder-ref-inline-table.html
 == 18217-zorder-5.html 18217-zorder-ref-inline-table.html
 == 23604-1.html 23604-1-ref.html
 == 23604-2.html 23604-2-ref.html
 != 24998-1.html 24998-1-ref.html
 # Debug builds and ASAN builds have larger stack frames, so skipped.
 # 32-bit Windows doesn't have enough run-time stack to deal with the test, so skipped.
-skip-if(isDebugBuild||AddressSanitizer||(winWidget&&(!is64Bit))||(Android&&AndroidVersion<21)||(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-256)&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) == 256180-1.html 256180-1-ref.html
+skip-if(isDebugBuild||AddressSanitizer||(winWidget&&(!is64Bit))||(Android&&AndroidVersion<21)) == 256180-1.html 256180-1-ref.html
 # Debug builds have larger stack frames, so skipped.
 # 32-bit Windows doesn't have enough run-time stack to deal with the test, so skipped.
-skip-if(isDebugBuild||(winWidget&&(!is64Bit))||(Android&&AndroidVersion<21)||(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-256)&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) == 256180-2.html 256180-2-ref.html
+skip-if(isDebugBuild||(winWidget&&(!is64Bit))||(Android&&AndroidVersion<21)) == 256180-2.html 256180-2-ref.html
 # Debug builds and ASAN builds have larger stack frames, so skipped.
 # 32-bit Windows doesn't have enough run-time stack to deal with the test, so skipped.
-skip-if(isDebugBuild||AddressSanitizer||(winWidget&&(!is64Bit))||(Android&&AndroidVersion<21)||(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-256)&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) == 256180-3.html 256180-3-ref.html
+skip-if(isDebugBuild||AddressSanitizer||(winWidget&&(!is64Bit))||(Android&&AndroidVersion<21)) == 256180-3.html 256180-3-ref.html
 # Debug builds have larger stack frames, so skipped.
 skip-if(isDebugBuild) == 256180-4.html 256180-4-ref.html
 skip-if(isDebugBuild) == 256180-6.html 256180-6-ref.html
 skip-if(isDebugBuild) == 256180-5.html 256180-5-ref.html
 == 25888-1l.html 25888-1l-ref.html
 != 25888-1l.html 25888-1l-notref.html
 == 25888-1r.html 25888-1r-ref.html
 != 25888-1r.html 25888-1r-notref.html