From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 22 Nov 2014 04:33:12 +0000 (-0800)
Subject: Issue #22869: Remove duplicate stack check from pythonrun.c
X-Git-Tag: v3.5.0a1~461
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b59dd4781c1fdcf79060f62e0e2f10f67a06c65;p=thirdparty%2FPython%2Fcpython.git

Issue #22869: Remove duplicate stack check from pythonrun.c
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 992a5a3ed09c..d435ef40fc11 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1376,43 +1376,6 @@ cleanup:
 }
 
 
-#if defined(USE_STACKCHECK)
-#if defined(WIN32) && defined(_MSC_VER)
-
-/* Stack checking for Microsoft C */
-
-#include <malloc.h>
-#include <excpt.h>
-
-/*
- * Return non-zero when we run out of memory on the stack; zero otherwise.
- */
-int
-PyOS_CheckStack(void)
-{
-    __try {
-        /* alloca throws a stack overflow exception if there's
-           not enough space left on the stack */
-        alloca(PYOS_STACK_MARGIN * sizeof(void*));
-        return 0;
-    } __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
-                    EXCEPTION_EXECUTE_HANDLER :
-            EXCEPTION_CONTINUE_SEARCH) {
-        int errcode = _resetstkoflw();
-        if (errcode == 0)
-        {
-            Py_FatalError("Could not reset the stack!");
-        }
-    }
-    return 1;
-}
-
-#endif /* WIN32 && _MSC_VER */
-
-/* Alternate implementations can be added here... */
-
-#endif /* USE_STACKCHECK */
-
 /* Deprecated C API functions still provided for binary compatiblity */
 
 #undef PyParser_SimpleParseFile