Handle negative ints properly in Py_STACKREF_DEBUG build

markshannon · markshannon · commit f6126b1622c5 · 2025-04-16T10:06:09.000+01:00
diff --git a/Python/stackrefs.c b/Python/stackrefs.c
@@ -206,7 +206,8 @@ intptr_t
 PyStackRef_UntagInt(_PyStackRef i)
 {
     assert(is_tagged_int(i));
-    return Py_ARITHMETIC_RIGHT_SHIFT(intptr_t, i.index, 1);
+    intptr_t val = (intptr_t)i.index;
+    return Py_ARITHMETIC_RIGHT_SHIFT(intptr_t, val, 1);
 }
 
 bool PyStackRef_IsTaggedInt(_PyStackRef ref)

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,8 @@ intptr_t`
`206`	`206`	`PyStackRef_UntagInt(_PyStackRef i)`
`207`	`207`	`{`
`208`	`208`	`assert(is_tagged_int(i));`
`209`		`- return Py_ARITHMETIC_RIGHT_SHIFT(intptr_t, i.index, 1);`
	`209`	`+ intptr_t val = (intptr_t)i.index;`
	`210`	`+ return Py_ARITHMETIC_RIGHT_SHIFT(intptr_t, val, 1);`
`210`	`211`	`}`
`211`	`212`
`212`	`213`	`bool PyStackRef_IsTaggedInt(_PyStackRef ref)`