[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (faulthandler ICC)

Mon Mar 23 21:21:53 CET 2015

https://hg.python.org/cpython/rev/b57c44655fea
changeset: 95145:b57c44655fea
parent: 95143:7e179ee91af0
parent: 95144:d6003de8ecc8
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Mar 23 21:21:00 2015 +0100
summary:
 Merge 3.4 (faulthandler ICC)
files:
 Misc/ACKS | 1 +
 Modules/faulthandler.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -440,6 +440,7 @@
 Chris Foster
 John Fouhy
 Andrew Francis
+Matt Frank
 Stefan Franke
 Martin Franklin
 Kent Frazier
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -941,7 +941,14 @@
 }
 
 #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)
 {
 /* allocate 4096 bytes on the stack at each call */
-- 
Repository URL: https://hg.python.org/cpython
