Make stack check handle sanitizers better

Author: markshannon

Include/pythonrun.h

@@ -25,7 +25,9 @@ PyAPI_DATA(int) (*PyOS_InputHook)(void);
  * no two calls to check recursion depth are more than this far
  * apart. In practice, that means it must be larger than the C
  * stack consumption of PyEval_EvalDefault */
-#if defined(Py_DEBUG) && defined(WIN32)
+#if defined(_Py_ADDRESS_SANITIZER) || defined(_Py_THREAD_SANITIZER)
+#  define PYOS_STACK_MARGIN 4096
+#elif defined(Py_DEBUG) && defined(WIN32)
 #  define PYOS_STACK_MARGIN 3072
 #else
 #  define PYOS_STACK_MARGIN 2048

Lib/test/test_functools.py

@@ -404,6 +404,7 @@ def test_setstate_subclasses(self):
         self.assertEqual(r, ((1, 2), {}))
         self.assertIs(type(r[0]), tuple)
 
+    @support.skip_if_sanitizer("thread sanitizer crashes in __tsan::FuncEntry", thread=True)
     @support.skip_emscripten_stack_overflow()
     def test_recursive_pickle(self):
         with replaced_module('functools', self.module):