bpo-43372: Use _freeze_importlib for regen-frozen.#24759
Merged
nascheme merged 1 commit intopython:masterfrom Mar 6, 2021
Merged
bpo-43372: Use _freeze_importlib for regen-frozen.#24759nascheme merged 1 commit intopython:masterfrom
nascheme merged 1 commit intopython:masterfrom
Conversation
This approach ensures the code matches the interpreter version. Previously, PYTHON_FOR_REGEN was used to generate the code, which might be wrong. The marshal format for code objects has changed with bpo-42246, commit 877df85. Update the code and the expected code sizes in ctypes test_frozentable.
This was referenced Mar 5, 2021
hroncok
reviewed
Mar 5, 2021
| 0,0,122,14,60,102,114,111,122,101,110,32,104,101,108,108, | ||
| 111,62,218,8,60,109,111,100,117,108,101,62,1,0,0,0, | ||
| 115,6,0,0,0,4,0,12,1,255,128, | ||
| }; |
Contributor
There was a problem hiding this comment.
I don't understand why the file is suddenly so different when in the previous pull requests, only one line was updated.
Member
Author
There was a problem hiding this comment.
I think it's because the co_filename has changed. _freeze_importlib sets it to "<frozen hello>". Previously it was set to "none".
Member
Author
There was a problem hiding this comment.
Oh, and _freeze_importlib line wraps the byte array a bit differently.
nascheme
commented
Mar 5, 2021
| 218,8,60,109,111,100,117,108,101,62,1,0,0, | ||
| 0,115,2,0,0,0,4,1, | ||
| /* Auto-generated by Programs/_freeze_importlib.c */ | ||
| const unsigned char _Py_M__hello[] = { |
Member
Author
There was a problem hiding this comment.
Not sure making this non-static is good. The _freeze_importlib could grow a command line option to make it static or non-static.
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
4 participants
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.
This approach ensures the code matches the interpreter version.
Previously, PYTHON_FOR_REGEN was used to generate the code, which might
be wrong. The marshal format for code objects has changed with
bpo-42246, commit 877df85. Update the code and the expected code sizes
in ctypes test_frozentable.
https://bugs.python.org/issue43372