Skip to content

Commit 0d5e962

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feat/hmac/hacl-99108
2 parents 1fcced4 + c26bed1 commit 0d5e962

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Doc/whatsnew/3.14.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,9 @@ configuration mechanisms).
224224
A new type of interpreter
225225
-------------------------
226226

227-
A new type of interpreter based on tail calls has been added to CPython.
227+
A new type of interpreter has been added to CPython.
228+
It uses tail calls between small C functions that implement individual
229+
Python opcodes, rather than one large C case statement.
228230
For certain newer compilers, this interpreter provides
229231
significantly better performance. Preliminary numbers on our machines suggest
230232
anywhere from -3% to 30% faster Python code, and a geometric mean of 9-15%

PCbuild/_freeze_module.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
<OldPyConfigH Condition="Exists('$(IntDir)pyconfig.h')">$([System.IO.File]::ReadAllText('$(IntDir)pyconfig.h'))</OldPyConfigH>
449449
</PropertyGroup>
450450
<PropertyGroup Condition="$(DisableGil) == 'true'">
451-
<PyConfigHText>$(PyConfigHText.Replace('#undef Py_GIL_DISABLED', '#define Py_GIL_DISABLED 1'))</PyConfigHText>
451+
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_GIL_DISABLED 1 */', '#define Py_GIL_DISABLED 1'))</PyConfigHText>
452452
</PropertyGroup>
453453
<Message Text="Updating pyconfig.h" Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />
454454
<WriteLinesToFile File="$(IntDir)pyconfig.h"

0 commit comments

Comments
 (0)