diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-18 13:08:14 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-18 13:08:14 (GMT) |
| commit | 258f17c96d2537050b9a3a5ae42b5fdaa1e80224 (patch) | |
| tree | aa6b7d1b432ba189e6295e6f1d9fd7921426af9b | |
| parent | 4298afe9f0f3f5945727252443afbe42eca2aee9 (diff) | |
| parent | 6df29ada02d22c43a8d439a70b820cb1ceacca42 (diff) | |
| download | cpython-258f17c96d2537050b9a3a5ae42b5fdaa1e80224.zip cpython-258f17c96d2537050b9a3a5ae42b5fdaa1e80224.tar.gz cpython-258f17c96d2537050b9a3a5ae42b5fdaa1e80224.tar.bz2 | |
Merge 3.5
| -rw-r--r-- | Include/pyatomic.h | 6 | ||||
| -rw-r--r-- | Include/pystate.h | 17 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/Include/pyatomic.h b/Include/pyatomic.h index 99816a5..892a217 100644 --- a/Include/pyatomic.h +++ b/Include/pyatomic.h @@ -1,8 +1,6 @@ -/* Issue #23644: <stdatomic.h> is incompatible with C++, see: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932 */ -#if !defined(Py_LIMITED_API) && !defined(__cplusplus) #ifndef Py_ATOMIC_H #define Py_ATOMIC_H +#ifdef Py_BUILD_CORE #include "dynamic_annotations.h" @@ -248,5 +246,5 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order) #define _Py_atomic_load_relaxed(ATOMIC_VAL) \ _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed) +#endif /* Py_BUILD_CORE */ #endif /* Py_ATOMIC_H */ -#endif /* Py_LIMITED_API */ diff --git a/Include/pystate.h b/Include/pystate.h index a2fd803..6000b81 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -177,20 +177,13 @@ PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *); /* Variable and macro for in-line access to current thread state */ /* Assuming the current thread holds the GIL, this is the - PyThreadState for the current thread. - - Issue #23644: pyatomic.h is incompatible with C++ (yet). Disable - PyThreadState_GET() optimization: declare it as an alias to - PyThreadState_Get(), as done for limited API. */ -#if !defined(Py_LIMITED_API) && !defined(__cplusplus) + PyThreadState for the current thread. */ +#ifdef Py_BUILD_CORE PyAPI_DATA(_Py_atomic_address) _PyThreadState_Current; -#endif - -#if defined(Py_DEBUG) || defined(Py_LIMITED_API) || defined(__cplusplus) -#define PyThreadState_GET() PyThreadState_Get() +# define PyThreadState_GET() \ + ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) #else -#define PyThreadState_GET() \ - ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) +# define PyThreadState_GET() PyThreadState_Get() #endif typedef @@ -100,6 +100,10 @@ Release date: TBA Core and Builtins ----------------- +- Issue #25150: Hide the private _Py_atomic_xxx symbols from the public + Python.h header to fix a compilation error with OpenMP. PyThreadState_GET() + becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies. + Library ------- |