Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf67da5c

Browse files
Merge branch 'main' into fix/129846
2 parents24e998e +39fa19a commitf67da5c

File tree

996 files changed

+33023
-17185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

996 files changed

+33023
-17185
lines changed

‎.github/CODEOWNERS

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,16 @@ Objects/exceptions.c @iritkatriel
107107
# Hashing & cryptographic primitives
108108
**/*hashlib*@gpshead@tiran@picnixz
109109
**/*hashopenssl*@gpshead@tiran@picnixz
110-
**/*pyhash*@gpshead@tiran
111-
**/sha*@gpshead@tiran@picnixz
112-
Modules/md5*@gpshead@tiran@picnixz
113-
**/*blake*@gpshead@tiran@picnixz
114-
Modules/_hacl/**@gpshead
110+
**/*pyhash*@gpshead@tiran@picnixz
111+
Modules/*blake*@gpshead@tiran@picnixz
112+
Modules/*md5*@gpshead@tiran@picnixz
113+
Modules/*sha*@gpshead@tiran@picnixz
114+
Modules/_hacl/**@gpshead@picnixz
115115
**/*hmac*@gpshead@picnixz
116116

117+
# libssl
118+
**/*ssl*@gpshead@picnixz
119+
117120
# logging
118121
**/*logging*@vsajip
119122

@@ -309,3 +312,6 @@ Doc/reference/ @willingc @AA-Turner
309312
# Colorize
310313
Lib/_colorize.py@hugovk
311314
Lib/test/test__colorize.py@hugovk
315+
316+
# Fuzzing
317+
Modules/_xxtestfuzz/@ammaraskar

‎.github/workflows/tail-call.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ name: Tail calling interpreter
22
on:
33
pull_request:
44
paths:
5+
-'.github/workflows/tail-call.yml'
56
-'Python/bytecodes.c'
67
-'Python/ceval.c'
78
-'Python/ceval_macros.h'
89
-'Python/generated_cases.c.h'
910
push:
1011
paths:
12+
-'.github/workflows/tail-call.yml'
1113
-'Python/bytecodes.c'
1214
-'Python/ceval.c'
1315
-'Python/ceval_macros.h'
@@ -35,7 +37,7 @@ jobs:
3537
target:
3638
# Un-comment as we add support for more platforms for tail-calling interpreters.
3739
# - i686-pc-windows-msvc/msvc
38-
# - x86_64-pc-windows-msvc/msvc
40+
-x86_64-pc-windows-msvc/msvc
3941
# - aarch64-pc-windows-msvc/msvc
4042
-x86_64-apple-darwin/clang
4143
-aarch64-apple-darwin/clang
@@ -48,9 +50,9 @@ jobs:
4850
# - target: i686-pc-windows-msvc/msvc
4951
# architecture: Win32
5052
# runner: windows-latest
51-
# - target: x86_64-pc-windows-msvc/msvc
52-
# architecture: x64
53-
# runner: windows-latest
53+
-target:x86_64-pc-windows-msvc/msvc
54+
architecture:x64
55+
runner:windows-latest
5456
# - target: aarch64-pc-windows-msvc/msvc
5557
# architecture: ARM64
5658
# runner: windows-latest
@@ -79,41 +81,49 @@ jobs:
7981

8082
-name:Native Windows (debug)
8183
if:runner.os == 'Windows' && matrix.architecture != 'ARM64'
84+
shell:cmd
8285
run:|
83-
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
84-
./PCbuild/build.bat --tail-call-interp -d -p ${{ matrix.architecture }}
85-
./PCbuild/rt.bat -d -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
86+
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.5
87+
set PlatformToolset=clangcl
88+
set LLVMToolsVersion=${{ matrix.llvm }}.1.5
89+
set LLVMInstallDir=C:\Program Files\LLVM
90+
call ./PCbuild/build.bat --tail-call-interp -d -p ${{ matrix.architecture }}
91+
call ./PCbuild/rt.bat -d -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
8692
8793
# No tests (yet):
8894
-name:Emulated Windows (release)
8995
if:runner.os == 'Windows' && matrix.architecture == 'ARM64'
96+
shell:cmd
9097
run:|
91-
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
98+
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.5
99+
set PlatformToolset=clangcl
100+
set LLVMToolsVersion=${{ matrix.llvm }}.1.5
101+
set LLVMInstallDir=C:\Program Files\LLVM
92102
./PCbuild/build.bat --tail-call-interp -p ${{ matrix.architecture }}
93103
94104
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
95105
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
96106
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
97107
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
98-
-name:Native macOS (debug)
108+
-name:Native macOS (release)
99109
if:runner.os == 'macOS'
100110
run:|
101111
brew update
102112
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
103113
brew install llvm@${{ matrix.llvm }}
104114
export SDKROOT="$(xcrun --show-sdk-path)"
105-
export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
106-
export PATH="/usr/local/opt/llvm/bin:$PATH"
107-
CC=clang-19 ./configure --with-tail-call-interp --with-pydebug
115+
export PATH="/opt/homebrew/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
116+
export PATH="/usr/local/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
117+
CC=clang-19 ./configure --with-tail-call-interp
108118
make all --jobs 4
109119
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
110120
111-
-name:Native Linux (release)
121+
-name:Native Linux (debug)
112122
if:runner.os == 'Linux' && matrix.target != 'free-threading'
113123
run:|
114124
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
115125
export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
116-
CC=clang-19 ./configure --with-tail-call-interp
126+
CC=clang-19 ./configure --with-tail-call-interp --with-pydebug
117127
make all --jobs 4
118128
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
119129

‎Doc/c-api/allocation.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ Allocating Objects on the Heap
3535
The size of the memory allocation is determined from the
3636
:c:member:`~PyTypeObject.tp_basicsize` field of the type object.
3737
38+
Note that this function is unsuitable if *typeobj* has
39+
:c:macro:`Py_TPFLAGS_HAVE_GC` set. For such objects,
40+
use :c:func:`PyObject_GC_New` instead.
41+
3842
3943
.. c:macro:: PyObject_NewVar(TYPE, typeobj, size)
4044
@@ -49,6 +53,10 @@ Allocating Objects on the Heap
4953
fields into the same allocation decreases the number of allocations,
5054
improving the memory management efficiency.
5155
56+
Note that this function is unsuitable if *typeobj* has
57+
:c:macro:`Py_TPFLAGS_HAVE_GC` set. For such objects,
58+
use :c:func:`PyObject_GC_NewVar` instead.
59+
5260
5361
.. c:function:: void PyObject_Del(void *op)
5462

‎Doc/c-api/dict.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Dictionary Objects
127127
Prefer the:c:func:`PyDict_GetItemWithError` function instead.
128128
129129
..versionchanged::3.10
130-
Calling this API without:term:`GIL` held had been allowed for historical
130+
Calling this API withoutan:term:`attached thread state` had been allowed for historical
131131
reason. It is no longer allowed.
132132
133133

‎Doc/c-api/exceptions.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ Querying the error indicator
413413
own a reference to the return value, so you do not need to :c:func:`Py_DECREF`
414414
it.
415415
416-
The caller musthold the GIL.
416+
The caller musthave an :term:`attached thread state`.
417417
418418
.. note::
419419
@@ -675,7 +675,7 @@ Signal Handling
675675
676676
..note::
677677
This function is async-signal-safe. It can be called without
678-
the:term:`GIL` and from a C signal handler.
678+
an:term:`attached thread state` and from a C signal handler.
679679
680680
681681
..c:function::intPyErr_SetInterruptEx(int signum)
@@ -702,7 +702,7 @@ Signal Handling
702702
703703
.. note::
704704
This function is async-signal-safe. It can be called without
705-
the :term:`GIL` and from a C signal handler.
705+
an :term:`attached thread state` and from a C signal handler.
706706
707707
.. versionadded:: 3.10
708708

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp