Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.4 (faulthandler ICC)

This commit is contained in:
Victor Stinner 2015-03-23 21:21:00 +01:00
parent 4dc2c221ca 19276f184f
commit d1f3a002c3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -440,6 +440,7 @@ Doug Fort
Chris Foster Chris Foster
John Fouhy John Fouhy
Andrew Francis Andrew Francis
Matt Frank
Stefan Franke Stefan Franke
Martin Franklin Martin Franklin
Kent Frazier Kent Frazier

9
Modules/faulthandler.c
View File

@ -941,7 +941,14 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args)
} }
#if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
static Py_uintptr_t #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
Py_uintptr_t
stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth) stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth)
{ {
/* allocate 4096 bytes on the stack at each call */ /* allocate 4096 bytes on the stack at each call */