Skip to content

Commit beaa0f8

Browse files
author
Anselm Kruis
committed
merge 3.3-slp (Stackless python#109)
2 parents 1312e98 + c3a3faa commit beaa0f8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tools/gdb/libpython.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,12 +1435,12 @@ def is_evalframeex(self):
14351435
try:
14361436
gdb.lookup_type("PyCFrameObject")
14371437
# it is Stackless Python
1438-
EVALFRAMEEX_FUNCTION_NAME = 'PyEval_EvalFrame_value'
1438+
EVALFRAMEEX_FUNCTION_NAME = ('slp_eval_frame_value', 'PyEval_EvalFrame_value')
14391439
except gdb.error:
14401440
# regular CPython
1441-
EVALFRAMEEX_FUNCTION_NAME = 'PyEval_EvalFrameEx'
1441+
EVALFRAMEEX_FUNCTION_NAME = ('PyEval_EvalFrameEx',)
14421442

1443-
if self._gdbframe.name() == EVALFRAMEEX_FUNCTION_NAME:
1443+
if self._gdbframe.name() in EVALFRAMEEX_FUNCTION_NAME:
14441444
'''
14451445
I believe we also need to filter on the inline
14461446
struct frame_id.inline_depth, only regarding frames with

0 commit comments

Comments
 (0)