Repository navigation
pyatomic include statement shouldn't use "cpython/*" but just "*" #129296
Description
Bug report
Bug description:
I'm looking at (and using) a build generated from:
git clone --depth 1 https://github.com/python/cpython.git --branch v3.13.1
pushd cpython
./configure --enable-optimizations --prefix=$(pwd)/install
make -j4
make install
popdin the file: cpython/install/include/python3.13/cpython/pyatomic.h
there is the statement
#if _Py_USE_GCC_BUILTIN_ATOMICS
# define Py_ATOMIC_GCC_H
# include "cpython/pyatomic_gcc.h"
# undef Py_ATOMIC_GCC_H
#elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
# define Py_ATOMIC_STD_H
# include "cpython/pyatomic_std.h"
# undef Py_ATOMIC_STD_H
#elif defined(_MSC_VER)
# define Py_ATOMIC_MSC_H
# include "cpython/pyatomic_msc.h"
# undef Py_ATOMIC_MSC_H
#else
# error "no available pyatomic implementation for this platform/compiler"
#endifthese includes say: include, relative to me (quotation), the file cpython/pyatomic_gcc.h
But there is no file "cpython/pyatomic_gcc.h" relative to the cypthon/pyatomic.h
I can of course compensate by putting a:
ln -s . cypthon
in that cpython directory
The fix is to change "cpython/pyatomic_gcc.h" to "pyatomic_gcc.h"
where quotation = "relative to me"
CPython versions tested on:
3.13
Operating systems tested on:
No response
Activity
ZeroIntensity commentedon Jan 26, 2025
The compiler should be falling back to the include path regardless--there's no actual compile error in practice, is there?
cc @colesbury
pythongh-129296: Fix `pyatomic.h` include paths
colesbury commentedon Jan 28, 2025
Yeah, I'm not sure there's any problem in practice, but it seems like we might as well fix it, and @zanieb already put up a PR.
There's one more place in
Include/cpythonwith a similar pattern:cpython/Include/cpython/pythread.h
Line 25 in a4459c3
zanieb commentedon Jan 28, 2025
I have no attachment to the change, though it does seem more consistent with the other library includes. Want me to add that one to the existing pull request or just put another one up?
gh-129296: Fix `pyatomic.h` include paths (#129320)
vstinner commentedon Jan 29, 2025
Thanks @timprepscius for the bug report and thanks @zanieb for the fix!
pythongh-129296: Fix `pyatomic.h` include paths (pythonGH-129320)
[3.12] gh-129296: Fix `pythread.h` include paths (#129320) (#130668)
[3.13] gh-129296: Fix `pyatomic.h` include paths (GH-129320) (#130667)