pythongh-117645: Increase WASI stack size from 512 KiB to 8 MiB

vstinner · vstinner · commit 6187587ed747 · 2024-04-09T12:35:08.000+02:00
diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
@@ -198,15 +198,10 @@ struct _ts {
 #ifdef Py_DEBUG
    // A debug build is likely built with low optimization level which implies
    // higher stack memory usage than a release build: use a lower limit.
-#  if defined(__wasi__)
-     // Based on wasmtime 16.
-#    define Py_C_RECURSION_LIMIT 150
-#  else
-#    define Py_C_RECURSION_LIMIT 500
-#  endif
+#  define Py_C_RECURSION_LIMIT 500
 #elif defined(__wasi__)
    // Based on wasmtime 16.
-#  define Py_C_RECURSION_LIMIT 500
+#  define Py_C_RECURSION_LIMIT 5000
 #elif defined(__s390x__)
 #  define Py_C_RECURSION_LIMIT 800
 #elif defined(_WIN32) && defined(_M_ARM64)
diff --git a/configure.ac b/configure.ac
@@ -2359,9 +2359,9 @@ AS_CASE([$ac_sys_system],
       AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--max-memory=10485760"])
     ])
 
-    dnl increase initial memory and stack size, move stack first
+    dnl gh-117645: increase initial memory and stack size, move stack first
     dnl https://github.com/WebAssembly/wasi-libc/issues/233
-    AS_VAR_APPEND([LDFLAGS_NODIST], [" -z stack-size=524288 -Wl,--stack-first -Wl,--initial-memory=10485760"])
+    AS_VAR_APPEND([LDFLAGS_NODIST], [" -z stack-size=8388608 -Wl,--stack-first -Wl,--initial-memory=10485760"])
   ]
 )
 

Original file line number	Diff line number	Diff line change
`@@ -2359,9 +2359,9 @@ AS_CASE([$ac_sys_system],`
`2359`	`2359`	`AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--max-memory=10485760"])`
`2360`	`2360`	`])`
`2361`	`2361`
`2362`		`- dnl increase initial memory and stack size, move stack first`
	`2362`	`+ dnl gh-117645: increase initial memory and stack size, move stack first`
`2363`	`2363`	`dnl https://github.com/WebAssembly/wasi-libc/issues/233`
`2364`		`- AS_VAR_APPEND([LDFLAGS_NODIST], [" -z stack-size=524288 -Wl,--stack-first -Wl,--initial-memory=10485760"])`
	`2364`	`+ AS_VAR_APPEND([LDFLAGS_NODIST], [" -z stack-size=8388608 -Wl,--stack-first -Wl,--initial-memory=10485760"])`
`2365`	`2365`	`]`
`2366`	`2366`	`)`
`2367`	`2367`