summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch
diff options
context:
space:
mode:
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.patch12
1 files changed, 5 insertions, 7 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
index 957839bf3e..793385de91 100644
--- 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
@@ -1,19 +1,20 @@
1From 6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d Mon Sep 17 00:00:00 2001 1From 9f63e83b1cec872917647b11155edaffe399d103 Mon Sep 17 00:00:00 2001
2From: Inada Naoki <songofacandy@gmail.com> 2From: Inada Naoki <songofacandy@gmail.com>
3Date: Sat, 14 Jul 2018 00:46:11 +0900 3Date: Sat, 14 Jul 2018 00:46:11 +0900
4Subject: [PATCH] Use FLAG_REF always for interned strings 4Subject: [PATCH] Use FLAG_REF always for interned strings
5 5
6Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] 6Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226]
7Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> 7Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
8
8--- 9---
9 Python/marshal.c | 9 +++++++-- 10 Python/marshal.c | 9 +++++++--
10 1 file changed, 7 insertions(+), 2 deletions(-) 11 1 file changed, 7 insertions(+), 2 deletions(-)
11 12
12diff --git a/Python/marshal.c b/Python/marshal.c 13diff --git a/Python/marshal.c b/Python/marshal.c
13index 6d06266c6a..51db2e3b2e 100644 14index c4538bd..2437160 100644
14--- a/Python/marshal.c 15--- a/Python/marshal.c
15+++ b/Python/marshal.c 16+++ b/Python/marshal.c
16@@ -275,9 +275,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) 17@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)
17 if (p->version < 3 || p->hashtable == NULL) 18 if (p->version < 3 || p->hashtable == NULL)
18 return 0; /* not writing object references */ 19 return 0; /* not writing object references */
19 20
@@ -28,8 +29,5 @@ index 6d06266c6a..51db2e3b2e 100644
28 return 0; 29 return 0;
29+ } 30+ }
30 31
31 entry = _Py_HASHTABLE_GET_ENTRY(p->hashtable, v); 32 entry = _Py_hashtable_get_entry(p->hashtable, v);
32 if (entry != NULL) { 33 if (entry != NULL) {
33--
342.21.0
35