Commit 49d146cc authored by Chris Toshok's avatar Chris Toshok

don't move this check to addTraceback, because lineInfoForFrame is what asserts.

parent 14ee9479
...@@ -502,10 +502,6 @@ public: ...@@ -502,10 +502,6 @@ public:
void addTraceback(const LineInfo& line_info) { void addTraceback(const LineInfo& line_info) {
RELEASE_ASSERT(is_active, ""); RELEASE_ASSERT(is_active, "");
if (skip) {
skip = false;
return;
}
if (exc_info.reraise) { if (exc_info.reraise) {
exc_info.reraise = false; exc_info.reraise = false;
return; return;
...@@ -588,7 +584,8 @@ void unwindingThroughFrame(UnwindSession* unwind_session, unw_cursor_t* cursor) ...@@ -588,7 +584,8 @@ void unwindingThroughFrame(UnwindSession* unwind_session, unw_cursor_t* cursor)
PythonFrameIteratorImpl frame_iter; PythonFrameIteratorImpl frame_iter;
if (frameIsPythonFrame(ip, bp, cursor, &frame_iter)) { if (frameIsPythonFrame(ip, bp, cursor, &frame_iter)) {
unwind_session->addTraceback(lineInfoForFrame(&frame_iter)); if (!unwind_session->shouldSkipFrame())
unwind_session->addTraceback(lineInfoForFrame(&frame_iter));
// frame_iter->cf->entry_descriptor will be non-null for OSR frames. // frame_iter->cf->entry_descriptor will be non-null for OSR frames.
unwind_session->setShouldSkipNextFrame((bool)frame_iter.cf->entry_descriptor); unwind_session->setShouldSkipNextFrame((bool)frame_iter.cf->entry_descriptor);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment