59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Victor Stinner <vstinner@python.org>
|
|
Date: Fri, 19 Jun 2020 17:16:05 +0200
|
|
Subject: [PATCH] 00343: Fix test_faulthandler on GCC 10
|
|
|
|
bpo-38965: Fix faulthandler._stack_overflow() on GCC 10
|
|
Fixed upstream and backported from the 3.7 branch:
|
|
https://bugs.python.org/issue38965
|
|
https://github.com/python/cpython/commit/f4a21d3b239bf4f4e4e2a8a5936b9b040645b246
|
|
|
|
bpo-21131: Fix faulthandler.register(chain=True) stack (GH-15276)
|
|
https://bugs.python.org/issue21131
|
|
https://github.com/python/cpython/commit/ac827edc493d3ac3f5b9b0cc353df1d4b418a9aa
|
|
---
|
|
Modules/faulthandler.c | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
|
|
index 890c64577c..fac662afc3 100644
|
|
--- a/Modules/faulthandler.c
|
|
+++ b/Modules/faulthandler.c
|
|
@@ -1091,18 +1091,14 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args)
|
|
#if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
|
|
#define FAULTHANDLER_STACK_OVERFLOW
|
|
|
|
-#ifdef __INTEL_COMPILER
|
|
- /* Issue #23654: Turn off ICC's tail call optimization for the
|
|
- * stack_overflow generator. ICC turns the recursive tail call into
|
|
- * a loop. */
|
|
-# pragma intel optimization_level 0
|
|
-#endif
|
|
-static
|
|
-uintptr_t
|
|
+static uintptr_t
|
|
stack_overflow(uintptr_t min_sp, uintptr_t max_sp, size_t *depth)
|
|
{
|
|
- /* allocate 4096 bytes on the stack at each call */
|
|
- unsigned char buffer[4096];
|
|
+ /* Allocate (at least) 4096 bytes on the stack at each call.
|
|
+
|
|
+ bpo-23654, bpo-38965: use volatile keyword to prevent tail call
|
|
+ optimization. */
|
|
+ volatile unsigned char buffer[4096];
|
|
uintptr_t sp = (uintptr_t)&buffer;
|
|
*depth += 1;
|
|
if (sp < min_sp || max_sp < sp)
|
|
@@ -1333,7 +1329,11 @@ int _PyFaulthandler_Init(void)
|
|
* be able to allocate memory on the stack, even on a stack overflow. If it
|
|
* fails, ignore the error. */
|
|
stack.ss_flags = 0;
|
|
- stack.ss_size = SIGSTKSZ;
|
|
+ /* bpo-21131: allocate dedicated stack of SIGSTKSZ*2 bytes, instead of just
|
|
+ SIGSTKSZ bytes. Calling the previous signal handler in faulthandler
|
|
+ signal handler uses more than SIGSTKSZ bytes of stack memory on some
|
|
+ platforms. */
|
|
+ stack.ss_size = SIGSTKSZ * 2;
|
|
stack.ss_sp = PyMem_Malloc(stack.ss_size);
|
|
if (stack.ss_sp != NULL) {
|
|
err = sigaltstack(&stack, &old_stack);
|