Add cinderx/python.h, handle atomic symbol collisions

Summary:
Adding a new header to wrap Python.h and to force the right order between atomic
and stdatomic.h.  This is only really an issue with 3.12 and later.  3.10.cinder
seems fine, in fact it gets upset if we include atomic headers before
internal/pycore_runtime.h so we have to avoid that.

All usage of Python.h should be replaced with cinderx/python.h now.
There's an exception carved out for cinderx/PythonBin to keep it simple.

Reviewed By: DinoV, mpage

Differential Revision: D78585773

fbshipit-source-id: 1d10410c43e1437413cee8c8692d9c410c34f5f6

Author: alexmalyshev

.clang-format

@@ -46,10 +46,13 @@ DisableFormat:   false
 ForEachMacros:   [ FOR_EACH, FOR_EACH_ENUMERATE, FOR_EACH_KV, FOR_EACH_R, FOR_EACH_RANGE, ]
 IncludeBlocks: Regroup
 IncludeCategories:
-  # Want to make sure that Python.h is included before any internal/ headers.
-  # Plus it is helpful to have it high up to make PY_VERSION_HEX available early.
+  # Want to make sure that Python.h and cinderx/python.h are included before
+  # any internal/ headers. We want it high up to make PY_VERSION_HEX
+  # available early.
   - Regex:     '^<Python.h>$'
     Priority:  1
+  - Regex:     '^"cinderx/python.h"$'
+    Priority:  1
 
   # Next come the other CPython headers.  This assumes that anything that looks
   # like "foo.h" is a CPython top-level header.  cinder/ headers are only found

CachedProperties/cached_properties.c

@@ -2,8 +2,6 @@
 
 #include "cinderx/CachedProperties/cached_properties.h"
 
-#include "structmember.h" // PyMemberDef
-
 #include "cinderx/Common/py-portability.h"
 #include "cinderx/Common/string.h"
 #include "cinderx/UpstreamBorrow/borrowed.h"

CachedProperties/cached_properties.h

@@ -3,7 +3,7 @@
 #ifndef Py_CACHED_PROPERTIES_H
 #define Py_CACHED_PROPERTIES_H
 
-#include <Python.h>
+#include "cinderx/python.h"
 
 /* fb t46346203 */
 typedef struct {

Common/audit.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <Python.h>
+#include "cinderx/python.h"
 
 #include <stdbool.h>
 

Common/code.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <Python.h>
+#include "cinderx/python.h"
 
 #if PY_VERSION_HEX >= 0x030D0000
 #include "internal/pycore_code.h"

Common/dict.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <Python.h>
+#include "cinderx/python.h"
 
 #include <stdbool.h>
 

Common/extra-py-flags.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Python.h>
+#include "cinderx/python.h"
 
 // Additional PyCodeObject flags (see Include/code.h)
 #define CI_CO_STATICALLY_COMPILED 0x4000000

Common/func.h

@@ -2,9 +2,7 @@
 
 #pragma once
 
-#include <Python.h>
-
-#include "structmember.h"
+#include "cinderx/python.h"
 
 #include <assert.h>
 

Common/import.h

@@ -1,7 +1,7 @@
 /* Copyright (c) Meta Platforms, Inc. and affiliates. */
 #pragma once
 
-#include <Python.h>
+#include "cinderx/python.h"
 
 #ifdef __cplusplus
 extern "C" {

Common/log.cpp

@@ -4,10 +4,6 @@
 
 #include "cinderx/Jit/threaded_compile.h"
 
-#if PY_VERSION_HEX < 0x030C0000
-#include "internal/pycore_pystate.h"
-#endif
-
 namespace jit {
 
 int g_debug = 0;
@@ -26,7 +22,7 @@ FILE* g_log_file = stderr;
 
 void printPythonException() {
 #if PY_VERSION_HEX < 0x030C0000
-  PyThreadState* tstate = _PyThreadState_GET();
+  PyThreadState* tstate = PyThreadState_Get();
   if (tstate != nullptr && tstate->curexc_type != nullptr) {
     PyErr_Display(
         tstate->curexc_type, tstate->curexc_value, tstate->curexc_traceback);