[SOT][3.12] Fix that frame in eval custom code was not released in tstate - #61703
Merged
SigureMo merged 2 commits intoFeb 8, 2024
Merged
Conversation
|
你的PR提交成功,感谢你对开源项目的贡献! |
frame in eval custom code was not released in tstateframe in eval custom code was not released in tstate
SigureMo
approved these changes
Feb 8, 2024
Comment on lines
+228
to
+233
| #if PY_VERSION_HEX >= 0x030c0000 | ||
| Internal_PyEvalFrameClearAndPop(tstate, frame); | ||
| #else | ||
| Internal_PyFrame_Clear(shadow); | ||
| free(shadow); | ||
| #endif |
Member
There was a problem hiding this comment.
之后加一个注释吧,因为两个分支一个清理 frame,一个清理 shadow,不清楚缘由的人很容易当成 bug 的
Member
|
记录: Python 3.11 和 3.12 的 frame 管理是不同的 Python 3.11 是自己管理, Python 3.12 则是会在
这里的差异导致了 3.11 和 3.12 分别清理了 shadow 和 frame,但其实是正确的 |
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

PR types
Bug fixes
PR changes
Others
Description
修复在 #61305 中遇到的问题
过不去 python debug 版本中的
framesize检查问题一:
原先使用自己
malloc创建的shadow没有对tstate进行管理,导致在RETURN_VALUE字节码中_PyEvalFrameClearAndPop的时候不能正常的清理和释放内存。解决方式:使用 cpython 自己的 Push 方式,这里用的是
_PyThreadState_PushFrame问题二:
没有对
frame在tstate进行同步_PyEvalFrameClearAndPop导致后续tstate->datastack_top异常