Incorporate feedback from review and buildbots

Author: markshannon

Include/internal/pycore_ceval.h

@@ -195,7 +195,7 @@ extern void _PyEval_DeactivateOpCache(void);
 
 static inline uintptr_t
 _Py_get_machine_stack_pointer(void) {
-#if defined(__GNUC__) || defined(__clang__)
+#if _Py__has_builtin(__builtin_frame_address)
     return (uintptr_t)__builtin_frame_address(0);
 #else
     char here;

Lib/test/test_builtin.py

@@ -1055,6 +1055,7 @@ def test_filter_pickle(self):
             f2 = filter(filter_char, "abcdeabcde")
             self.check_iter_pickle(f1, list(f2), proto)
 
+    @support.skip_wasi_stack_overflow()
     @support.requires_resource('cpu')
     def test_filter_dealloc(self):
         # Tests recursive deallocation of nested filter objects using the

Lib/test/test_call.py

@@ -1,6 +1,6 @@
 import unittest
 from test.support import (cpython_only, is_wasi, requires_limited_api, Py_DEBUG,
-                          set_recursion_limit, skip_on_s390x, exceeds_recursion_limit, skip_emscripten_stack_overflow,
+                          set_recursion_limit, skip_on_s390x, exceeds_recursion_limit, skip_emscripten_stack_overflow, skip_wasi_stack_overflow,
                           skip_if_sanitizer, import_helper)
 try:
     import _testcapi
@@ -1040,6 +1040,7 @@ class TestRecursion(unittest.TestCase):
     @skip_if_sanitizer("requires deep stack", thread=True)
     @unittest.skipIf(_testcapi is None, "requires _testcapi")
     @skip_emscripten_stack_overflow()
+    @skip_wasi_stack_overflow()
     def test_super_deep(self):
 
         def recurse(n):

Lib/test/test_descr.py

@@ -4519,6 +4519,7 @@ class Oops(object):
         o.whatever = Provoker(o)
         del o
 
+    @support.skip_wasi_stack_overflow()
     @support.requires_resource('cpu')
     def test_wrapper_segfault(self):
         # SF 927248: deeply nested wrappers could cause stack overflow

Lib/test/test_exceptions.py

@@ -1391,7 +1391,7 @@ def g():
         self.assertIsInstance(exc, RecursionError, type(exc))
         self.assertIn("maximum recursion depth exceeded", str(exc))
 
-
+    @support.skip_wasi_stack_overflow()
     @cpython_only
     @support.requires_resource('cpu')
     def test_trashcan_recursion(self):

Python/ceval.c

@@ -372,8 +372,10 @@ _Py_InitializeRecursionLimits(PyThreadState *tstate)
         _tstate->c_stack_top = base + stack_size;
         _tstate->c_stack_soft_limit = base + PYOS_STACK_MARGIN_BYTES * 2;
         _tstate->c_stack_hard_limit = base + PYOS_STACK_MARGIN_BYTES;
+#ifndef _AIX
         assert(_tstate->c_stack_soft_limit < here_addr);
         assert(here_addr < _tstate->c_stack_top);
+#endif
         return;
     }
 #  endif