Skip to content

Commit 03a61cc

Browse files
committed
Merge branch 'main' into fix/sqlite/uaf-in-progress-142830
2 parents f089fb6 + b6b0e14 commit 03a61cc

38 files changed

+1566
-1013
lines changed

Doc/library/inspect.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ attributes (see :ref:`import-mod-attrs` for module attributes):
273273
+-----------------+-------------------+---------------------------+
274274
| | ag_running | is the generator running? |
275275
+-----------------+-------------------+---------------------------+
276+
| | ag_suspended | is the generator |
277+
| | | suspended? |
278+
+-----------------+-------------------+---------------------------+
276279
| | ag_code | code |
277280
+-----------------+-------------------+---------------------------+
278281
| coroutine | __name__ | name |
@@ -286,6 +289,9 @@ attributes (see :ref:`import-mod-attrs` for module attributes):
286289
+-----------------+-------------------+---------------------------+
287290
| | cr_running | is the coroutine running? |
288291
+-----------------+-------------------+---------------------------+
292+
| | cr_suspended | is the coroutine |
293+
| | | suspended? |
294+
+-----------------+-------------------+---------------------------+
289295
| | cr_code | code |
290296
+-----------------+-------------------+---------------------------+
291297
| | cr_origin | where coroutine was |
@@ -319,6 +325,18 @@ attributes (see :ref:`import-mod-attrs` for module attributes):
319325

320326
Add ``__builtins__`` attribute to functions.
321327

328+
.. versionchanged:: 3.11
329+
330+
Add ``gi_suspended`` attribute to generators.
331+
332+
.. versionchanged:: 3.11
333+
334+
Add ``cr_suspended`` attribute to coroutines.
335+
336+
.. versionchanged:: 3.12
337+
338+
Add ``ag_suspended`` attribute to async generators.
339+
322340
.. versionchanged:: 3.14
323341

324342
Add ``f_generator`` attribute to frames.

Doc/library/zoneinfo.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ The ``ZoneInfo`` class has two alternate constructors:
206206

207207
Objects created via this constructor cannot be pickled (see `pickling`_).
208208

209+
:exc:`ValueError` is raised if the data read from *file_obj* is not a valid
210+
TZif file.
211+
209212
.. classmethod:: ZoneInfo.no_cache(key)
210213

211214
An alternate constructor that bypasses the constructor's cache. It is

Doc/tools/extensions/lexers/asdl_lexer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ASDLLexer(RegexLexer):
2222
bygroups(Keyword, Text, Name.Tag),
2323
),
2424
(
25-
r"(\w+)(\*\s|\?\s|\s)(\w+)",
25+
r"(\w+)([\?\*]*\s)(\w+)",
2626
bygroups(Name.Builtin.Pseudo, Operator, Name),
2727
),
2828
# Keep in line with ``builtin_types`` from Parser/asdl.py.

Doc/whatsnew/3.15.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -854,11 +854,13 @@ Optimizations
854854

855855
* Builds using Visual Studio 2026 (MSVC 18) may now use the new
856856
:ref:`tail-calling interpreter <whatsnew314-tail-call-interpreter>`.
857-
Results on an early experimental MSVC compiler reported roughly 15% speedup
858-
on the geometric mean of pyperformance on Windows x86-64 over
859-
the switch-case interpreter. We have
860-
observed speedups ranging from 15% for large pure-Python libraries
857+
Results on Visual Studio 18.1.1 report between
858+
`15-20% <https://github.com/faster-cpython/ideas/blob/main/results/5800X-msvc.pgo2-vs-msvc.pgo.tc.svg>`__
859+
speedup on the geometric mean of pyperformance on Windows x86-64 over
860+
the switch-case interpreter on an AMD Ryzen 7 5800X. We have
861+
observed speedups ranging from 14% for large pure-Python libraries
861862
to 40% for long-running small pure-Python scripts on Windows.
863+
This was made possible by a new feature introduced in MSVC 18.
862864
(Contributed by Chris Eibl, Ken Jin, and Brandt Bucher in :gh:`143068`.
863865
Special thanks to the MSVC team including Hulon Jenkins.)
864866

Include/internal/pycore_ceval.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ extern int _PyPerfTrampoline_SetCallbacks(_PyPerf_Callbacks *);
103103
extern void _PyPerfTrampoline_GetCallbacks(_PyPerf_Callbacks *);
104104
extern int _PyPerfTrampoline_Init(int activate);
105105
extern int _PyPerfTrampoline_Fini(void);
106-
extern void _PyPerfTrampoline_FreeArenas(void);
107106
extern int _PyIsPerfTrampolineActive(void);
108107
extern PyStatus _PyPerfTrampoline_AfterFork_Child(void);
109108
#ifdef PY_HAVE_PERF_TRAMPOLINE

Include/internal/pycore_interp_structs.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ struct _ceval_runtime_state {
8787
struct trampoline_api_st trampoline_api;
8888
FILE *map_file;
8989
Py_ssize_t persist_after_fork;
90-
_PyFrameEvalFunction prev_eval_frame;
90+
_PyFrameEvalFunction prev_eval_frame;
91+
Py_ssize_t trampoline_refcount;
92+
int code_watcher_id;
9193
#else
9294
int _not_used;
9395
#endif

Include/internal/pycore_opcode_metadata.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)