[SOT][3.12] fix codegen out of range about generating LOAD_ATTR in Python 3.12
#62176
Conversation
This file contains 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
|
你的PR提交成功，感谢你对开源项目的贡献! |
SigureMo
reviewed
Feb 28, 2024
Comment on lines
745
to
752
| def gen_load_attr(self, name: str, push_null=False): | ||
| if name not in self._code_options["co_names"]: | ||
| self._code_options["co_names"].append(name) | ||
| idx = self._code_options["co_names"].index(name) | ||
| if sys.version_info >= (3, 12): | ||
| idx <<= 1 | ||
| if push_null: | ||
| idx |= 1 |
There was a problem hiding this comment.
与 LOAD_GLOBAL 不同，LOAD_ATTR 在 3.12 的最后一位用于表示 is_method，所以变量名需要修改下
Comment on lines
127
to
130
| if sys.version_info >= (3, 12): | ||
| codegen.gen_load_attr("update", True) | ||
| else: | ||
| codegen.gen_load_method("update") |
There was a problem hiding this comment.
不建议在这里做版本分发，可以考虑在 gen_load_method 中将 3.12+ 行为分发到 gen_load_attr(name, is_method)
SigureMo
reviewed
Feb 29, 2024
| idx = self._code_options["co_names"].index(name) | ||
| return self.add_instr("LOAD_METHOD", arg=idx, argval=name) | ||
| if sys.version_info >= (3, 12): | ||
| self.gen_load_attr(name, True) |
There was a problem hiding this comment.
这里也加一个 return 吧，不然两个分支返回类型是不一致的
另外，加 return 的话，可以改写成 Early Return 的形式，去掉 else 及缩进
gouzil
approved these changes
Feb 29, 2024
Closed
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
Others
PR changes
Others
Description
python 3.12中，test_21_global.py单测codegen超出范围报错：
ValueError: bytes must be in range(0, 256)，排查发现是因为side_effect文件的dict默认调用gen_load_method，对应的opcode是262 所以出错；3.12中dict.update/clear函数调用不会生成
LOAD_METHOD字节码，所以改成生成LOAD_ATTR，而dict的update/clear方法需要生成LOAD_ATTR额外push NULL；TODO: test_inplace_api.py存在类似codegen问题和
POP_JUMP_FORWARD_IF_FALSE不支持生成问题