diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:16:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:28:36 +0100 |
commit | b06633b6ae91132f444a15a7f11dd778f01d5b6f (patch) | |
tree | 6e0c7f2733abbe6d9df9619492a98f544b2a63a7 /meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch | |
parent | 852f802a319e2d25cbf4e9bdf838c06f487c8a05 (diff) | |
download | poky-b06633b6ae91132f444a15a7f11dd778f01d5b6f.tar.gz |
python3: update 3.10.6 -> 3.11.0
The semaphore fix has landed and is available from 3.11 onwards:
https://github.com/python/cpython/commit/1ee0f94d16f150356a4b9b0a39d44ba1d2d5b9fc
Drop 0001-Mitigate-the-race-condition-in-testSockName.patch
as it is merged upstream.
(From OE-Core rev: f10cdc155e47af5627ee999c57e1d083f9382a91)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch b/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch deleted file mode 100644 index 993ac243fc..0000000000 --- a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From d7217b79a4e125d4fcc1087743171b94d91d1121 Mon Sep 17 00:00:00 2001 | ||
2 | From: Inada Naoki <songofacandy@gmail.com> | ||
3 | Date: Sat, 14 Jul 2018 00:46:11 +0900 | ||
4 | Subject: [PATCH] Use FLAG_REF always for interned strings | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] | ||
7 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Python/marshal.c | 9 +++++++-- | ||
11 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/Python/marshal.c b/Python/marshal.c | ||
14 | index 4125240..341c9aa 100644 | ||
15 | --- a/Python/marshal.c | ||
16 | +++ b/Python/marshal.c | ||
17 | @@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) | ||
18 | if (p->version < 3 || p->hashtable == NULL) | ||
19 | return 0; /* not writing object references */ | ||
20 | |||
21 | - /* if it has only one reference, it definitely isn't shared */ | ||
22 | - if (Py_REFCNT(v) == 1) | ||
23 | + /* If it has only one reference, it definitely isn't shared. | ||
24 | + * But we use TYPE_REF always for interned string, to PYC file stable | ||
25 | + * as possible. | ||
26 | + */ | ||
27 | + if (Py_REFCNT(v) == 1 && | ||
28 | + !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) { | ||
29 | return 0; | ||
30 | + } | ||
31 | |||
32 | entry = _Py_hashtable_get_entry(p->hashtable, v); | ||
33 | if (entry != NULL) { | ||