GH-93249: relax overly strict assertion on bounds->ar_start (GH-93961)

This commit is contained in:
Irit Katriel 2022-06-20 17:13:39 +01:00 committed by GitHub
parent cfb986a1a2
commit 1603a1029f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 2 deletions

View File

@ -4,6 +4,7 @@ from collections import namedtuple
from io import StringIO
import linecache
import sys
import types
import inspect
import unittest
import re
@ -1128,7 +1129,7 @@ boundaries = re.compile(
class BaseExceptionReportingTests:
def get_exception(self, exception_or_callable):
if isinstance(exception_or_callable, Exception):
if isinstance(exception_or_callable, BaseException):
return exception_or_callable
try:
exception_or_callable()
@ -1850,6 +1851,31 @@ class BaseExceptionReportingTests:
report = self.get_report(exc)
self.assertEqual(report, expected)
def test_KeyboardInterrupt_at_first_line_of_frame(self):
# see GH-93249
def f():
return sys._getframe()
tb_next = None
frame = f()
lasti = 0
lineno = f.__code__.co_firstlineno
tb = types.TracebackType(tb_next, frame, lasti, lineno)
exc = KeyboardInterrupt()
exc.__traceback__ = tb
expected = (f'Traceback (most recent call last):\n'
f' File "{__file__}", line {lineno}, in f\n'
f' def f():\n'
f'\n'
f'KeyboardInterrupt\n')
report = self.get_report(exc)
# remove trailing writespace:
report = '\n'.join([l.rstrip() for l in report.split('\n')])
self.assertEqual(report, expected)
class PyExcReportingTests(BaseExceptionReportingTests, unittest.TestCase):
#

View File

@ -826,6 +826,11 @@ next_code_delta(PyCodeAddressRange *bounds)
static int
previous_code_delta(PyCodeAddressRange *bounds)
{
if (bounds->ar_start == 0) {
// If we looking at the first entry, the
// "previous" entry has an implicit length of 1.
return 1;
}
const uint8_t *ptr = bounds->opaque.lo_next-1;
while (((*ptr) & 128) == 0) {
ptr--;
@ -869,7 +874,7 @@ static void
retreat(PyCodeAddressRange *bounds)
{
ASSERT_VALID_BOUNDS(bounds);
assert(bounds->ar_start > 0);
assert(bounds->ar_start >= 0);
do {
bounds->opaque.lo_next--;
} while (((*bounds->opaque.lo_next) & 128) == 0);