Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion Lib/test/test_traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from io import StringIO
import linecache
import sys
import types
import inspect
import unittest
import re
Expand Down Expand Up @@ -1128,7 +1129,7 @@ def test_print_exception_bad_type_python(self):
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()
Expand Down Expand Up @@ -1850,6 +1851,31 @@ def exc():
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):
#
Expand Down
7 changes: 6 additions & 1 deletion Objects/codeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,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--;
Expand Down Expand Up @@ -818,7 +823,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);
Expand Down