Remove end-line table from code objects.

python · markshannon · Apr 21, 2022 · Apr 8, 2022 · Apr 14, 2022 · Apr 14, 2022
commit 6f69354fc24aaee0e39a14aebcab51594a172ed7
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
@@ -89,10 +89,6 @@ typedef uint16_t _Py_CODEUNIT;
     PyObject *co_linetable;       /* bytes (encoding addr<->lineno mapping)    \
                                      See Objects/lnotab_notes.txt for details. \
                                   */                                           \
-    PyObject *co_endlinetable;    /* bytes object that holds end lineno for    \
-                                     instructions separated across different   \
-                                     lines */                                  \
-                                                                               \
     PyObject *co_locationtable;   /* bytes object that holds location info */ \
     PyObject *co_weakreflist;     /* to support weakrefs to code objects */    \
     /* Scratch space for extra data relating to the code object.               \
@@ -152,13 +148,13 @@ PyAPI_FUNC(PyCodeObject *) PyCode_New(
         int, int, int, int, int, PyObject *, PyObject *,
         PyObject *, PyObject *, PyObject *, PyObject *,
         PyObject *, PyObject *, PyObject *, int, PyObject *,
-        PyObject *, PyObject *, PyObject *);
+        PyObject *, PyObject *);
 
 PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs(
         int, int, int, int, int, int, PyObject *, PyObject *,
         PyObject *, PyObject *, PyObject *, PyObject *,
         PyObject *, PyObject *, PyObject *, int, PyObject *,
-        PyObject *, PyObject *, PyObject *);
+        PyObject *, PyObject *);
         /* same as struct above */
 
 /* Creates a new empty code object with the specified source location. */

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -176,7 +176,6 @@ struct _PyCodeConstructor {
     PyObject *code;
     int firstlineno;
     PyObject *linetable;
-    PyObject *endlinetable;
     PyObject *locationtable;
 
     /* used by the code */

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
@@ -231,7 +231,6 @@ def func(): pass
                         co.co_qualname,
                         co.co_firstlineno,
                         co.co_lnotab,
-                        co.co_endlinetable,
                         co.co_locationtable,
                         co.co_exceptiontable,
                         co.co_freevars,
@@ -273,7 +272,6 @@ def func2():
             ("co_filename", "newfilename"),
             ("co_name", "newname"),
             ("co_linetable", code2.co_linetable),
-            ("co_endlinetable", code2.co_endlinetable),
         ):
             with self.subTest(attr=attr, value=value):
                 new_code = code.replace(**{attr: value})
@@ -311,7 +309,6 @@ def func():
                          co.co_qualname,
                          co.co_firstlineno,
                          co.co_lnotab,
-                         co.co_endlinetable,
                          co.co_locationtable,
                          co.co_exceptiontable,
                          co.co_freevars,

diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
@@ -129,7 +129,7 @@ def test_different_filenames(self):
         self.assertEqual(co2.co_filename, "f2")
 
     @requires_debug_ranges()
-    def test_no_columntable_and_endlinetable_with_no_debug_ranges(self):
+    def test_minimal_locationtable_with_no_debug_ranges(self):
         # Make sure when demarshalling objects with `-X no_debug_ranges`
         # that the columns are None.
         co = ExceptionTestCase.test_exceptions.__code__

diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h