bpo-45355: More use of sizeof(_Py_CODEUNIT) (GH-28720)

serhiy-storchaka · web-flow · commit 252b7bcb236d · 2021-10-04T14:11:26.000+03:00
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -656,15 +656,13 @@ _PyCode_Addr2Offset(PyCodeObject* co, int addrq)
     if (co->co_columntable == Py_None || addrq < 0) {
         return -1;
     }
-    if (addrq % 2 == 1) {
-        --addrq;
-    }
-    if (addrq >= PyBytes_GET_SIZE(co->co_columntable)) {
+    addrq /= sizeof(_Py_CODEUNIT);
+    if (addrq*2 >= PyBytes_GET_SIZE(co->co_columntable)) {
         return -1;
     }
 
     unsigned char* bytes = (unsigned char*)PyBytes_AS_STRING(co->co_columntable);
-    return bytes[addrq] - 1;
+    return bytes[addrq*2] - 1;
 }
 
 int
@@ -673,15 +671,13 @@ _PyCode_Addr2EndOffset(PyCodeObject* co, int addrq)
     if (co->co_columntable == Py_None || addrq < 0) {
         return -1;
     }
-    if (addrq % 2 == 0) {
-        ++addrq;
-    }
-    if (addrq >= PyBytes_GET_SIZE(co->co_columntable)) {
+    addrq /= sizeof(_Py_CODEUNIT);
+    if (addrq*2+1 >= PyBytes_GET_SIZE(co->co_columntable)) {
         return -1;
     }
 
     unsigned char* bytes = (unsigned char*)PyBytes_AS_STRING(co->co_columntable);
-    return bytes[addrq] - 1;
+    return bytes[addrq*2+1] - 1;
 }
 
 void
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
@@ -373,8 +373,8 @@ marklines(PyCodeObject *code, int len)
     }
 
     while (PyLineTable_NextAddressRange(&bounds)) {
-        assert(bounds.ar_start/2 < len);
-        linestarts[bounds.ar_start/2] = bounds.ar_line;
+        assert(bounds.ar_start/(int)sizeof(_Py_CODEUNIT) < len);
+        linestarts[bounds.ar_start/sizeof(_Py_CODEUNIT)] = bounds.ar_line;
     }
     return linestarts;
 }
diff --git a/Python/compile.c b/Python/compile.c
@@ -7081,7 +7081,7 @@ assemble_line_range(struct assembler* a, int current, PyObject** table,
                     int* prev, int* start, int* offset)
 {
     int ldelta, bdelta;
-    bdelta = (a->a_offset - *start) * 2;
+    bdelta = (a->a_offset - *start) * sizeof(_Py_CODEUNIT);
     if (bdelta == 0) {
         return 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -656,15 +656,13 @@ _PyCode_Addr2Offset(PyCodeObject* co, int addrq)`
`656`	`656`	`if (co->co_columntable == Py_None \|\| addrq < 0) {`
`657`	`657`	`return -1;`
`658`	`658`	`}`
`659`		`- if (addrq % 2 == 1) {`
`660`		`- --addrq;`
`661`		`- }`
`662`		`- if (addrq >= PyBytes_GET_SIZE(co->co_columntable)) {`
	`659`	`+ addrq /= sizeof(_Py_CODEUNIT);`
	`660`	`+ if (addrq*2 >= PyBytes_GET_SIZE(co->co_columntable)) {`
`663`	`661`	`return -1;`
`664`	`662`	`}`
`665`	`663`
`666`	`664`	`unsigned char* bytes = (unsigned char*)PyBytes_AS_STRING(co->co_columntable);`
`667`		`- return bytes[addrq] - 1;`
	`665`	`+ return bytes[addrq*2] - 1;`
`668`	`666`	`}`
`669`	`667`
`670`	`668`	`int`
`@@ -673,15 +671,13 @@ _PyCode_Addr2EndOffset(PyCodeObject* co, int addrq)`
`673`	`671`	`if (co->co_columntable == Py_None \|\| addrq < 0) {`
`674`	`672`	`return -1;`
`675`	`673`	`}`
`676`		`- if (addrq % 2 == 0) {`
`677`		`- ++addrq;`
`678`		`- }`
`679`		`- if (addrq >= PyBytes_GET_SIZE(co->co_columntable)) {`
	`674`	`+ addrq /= sizeof(_Py_CODEUNIT);`
	`675`	`+ if (addrq*2+1 >= PyBytes_GET_SIZE(co->co_columntable)) {`
`680`	`676`	`return -1;`
`681`	`677`	`}`
`682`	`678`
`683`	`679`	`unsigned char* bytes = (unsigned char*)PyBytes_AS_STRING(co->co_columntable);`
`684`		`- return bytes[addrq] - 1;`
	`680`	`+ return bytes[addrq*2+1] - 1;`
`685`	`681`	`}`
`686`	`682`
`687`	`683`	`void`
Original file line number	Diff line number	Diff line change
`@@ -373,8 +373,8 @@ marklines(PyCodeObject *code, int len)`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`while (PyLineTable_NextAddressRange(&bounds)) {`
`376`		`- assert(bounds.ar_start/2 < len);`
`377`		`- linestarts[bounds.ar_start/2] = bounds.ar_line;`
	`376`	`+ assert(bounds.ar_start/(int)sizeof(_Py_CODEUNIT) < len);`
	`377`	`+ linestarts[bounds.ar_start/sizeof(_Py_CODEUNIT)] = bounds.ar_line;`
`378`	`378`	`}`
`379`	`379`	`return linestarts;`
`380`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7081,7 +7081,7 @@ assemble_line_range(struct assembler* a, int current, PyObject** table,`
`7081`	`7081`	`int* prev, int* start, int* offset)`
`7082`	`7082`	`{`
`7083`	`7083`	`int ldelta, bdelta;`
`7084`		`- bdelta = (a->a_offset - start) 2;`
	`7084`	`+ bdelta = (a->a_offset - start) sizeof(_Py_CODEUNIT);`
`7085`	`7085`	`if (bdelta == 0) {`
`7086`	`7086`	`return 1;`
`7087`	`7087`	`}`