| Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 1 | From 6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d 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 | Python/marshal.c | 9 +++++++-- |
| 10 | 1 file changed, 7 insertions(+), 2 deletions(-) |
| 11 | |
| 12 | diff --git a/Python/marshal.c b/Python/marshal.c |
| 13 | index 6d06266c6a..51db2e3b2e 100644 |
| 14 | --- a/Python/marshal.c |
| 15 | +++ b/Python/marshal.c |
| 16 | @@ -275,9 +275,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) |
| 17 | if (p->version < 3 || p->hashtable == NULL) |
| 18 | return 0; /* not writing object references */ |
| 19 | |
| 20 | - /* if it has only one reference, it definitely isn't shared */ |
| 21 | - if (Py_REFCNT(v) == 1) |
| 22 | + /* If it has only one reference, it definitely isn't shared. |
| 23 | + * But we use TYPE_REF always for interned string, to PYC file stable |
| 24 | + * as possible. |
| 25 | + */ |
| 26 | + if (Py_REFCNT(v) == 1 && |
| 27 | + !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) { |
| 28 | return 0; |
| 29 | + } |
| 30 | |
| 31 | entry = _Py_HASHTABLE_GET_ENTRY(p->hashtable, v); |
| 32 | if (entry != NULL) { |
| 33 | -- |
| 34 | 2.21.0 |
| 35 | |