Add news; no need on functions

JelleZijlstra · Oct 10, 2023 · 21b9349 · 21b9349
1 parent 371f1b2
commit 21b9349
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-09-19-54-33.gh-issue-110543.1wrxO8.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-09-19-54-33.gh-issue-110543.1wrxO8.rst
@@ -0,0 +1,3 @@
+Fix regression in Python 3.12 where :meth:`types.CodeType.replace` would
+produce a broken code object if called on a module or class code object that
+contains a comprehension. Patch by Jelle Zijlstra.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -657,29 +657,32 @@ PyUnstable_Code_NewWithPosOnlyArgs(
                                localsplusnames, localspluskinds);
     }
 
-    int code_len = PyBytes_GET_SIZE(code);
-    _Py_CODEUNIT *code_data = (_Py_CODEUNIT *)PyBytes_AS_STRING(code);
-    int num_code_units = code_len / sizeof(_Py_CODEUNIT);
-    int extended_arg = 0;
-    for (int i = 0; i < num_code_units; i += 1 + _PyOpcode_Caches[code_data[i].op.code]) {
-        _Py_CODEUNIT *instr = &code_data[i];
-        uint8_t opcode = instr->op.code;
-        if (opcode == EXTENDED_ARG) {
-            extended_arg = extended_arg << 8 | instr->op.arg;
-            continue;
-        }
-        if (opcode == LOAD_FAST_AND_CLEAR) {
-            int oparg = extended_arg << 8 | instr->op.arg;
-            if (oparg >= nlocalsplus) {
-                PyErr_Format(PyExc_ValueError,
-                            "code: LOAD_FAST_AND_CLEAR oparg %d out of range",
-                            oparg);
-                goto error;
+    // gh-110543: Make sure the CO_FAST_HIDDEN flag is set correctly.
+    if (!(flags & CO_OPTIMIZED)) {
+        int code_len = PyBytes_GET_SIZE(code);
+        _Py_CODEUNIT *code_data = (_Py_CODEUNIT *)PyBytes_AS_STRING(code);
+        int num_code_units = code_len / sizeof(_Py_CODEUNIT);
+        int extended_arg = 0;
+        for (int i = 0; i < num_code_units; i += 1 + _PyOpcode_Caches[code_data[i].op.code]) {
+            _Py_CODEUNIT *instr = &code_data[i];
+            uint8_t opcode = instr->op.code;
+            if (opcode == EXTENDED_ARG) {
+                extended_arg = extended_arg << 8 | instr->op.arg;
+                continue;
+            }
+            if (opcode == LOAD_FAST_AND_CLEAR) {
+                int oparg = extended_arg << 8 | instr->op.arg;
+                if (oparg >= nlocalsplus) {
+                    PyErr_Format(PyExc_ValueError,
+                                "code: LOAD_FAST_AND_CLEAR oparg %d out of range",
+                                oparg);
+                    goto error;
+                }
+                _PyLocals_Kind kind = _PyLocals_GetKind(localspluskinds, oparg);
+                _PyLocals_SetKind(localspluskinds, oparg, kind | CO_FAST_HIDDEN);
             }
-            _PyLocals_Kind kind = _PyLocals_GetKind(localspluskinds, oparg);
-            _PyLocals_SetKind(localspluskinds, oparg, kind | CO_FAST_HIDDEN);
+            extended_arg = 0;
         }
-        extended_arg = 0;
     }
 
     // If any cells were args then nlocalsplus will have shrunk.