gh-152298: Replace lazy import globals on resolve#152524
Draft
1sgtpepper wants to merge 14 commits into
Draft
Conversation
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.
Fixes gh-152298.
LazyImportType.resolve()now caches successful lazy reification and finalizes the recorded original module global before the lazy import path releases the import lock. The original global is replaced only when the recorded key still points at the same lazy proxy, so aliases, deleted globals, and rebound globals are not retargeted.This prevents
resolve()and later normal global access, or competing reification callers, from importing the same lazy proxy more than once.Regression tests cover the reported custom
__import__case, from-import bindings, rebound and deleted globals, copied proxy aliases, retry after failure, and repeatedresolve()on copied proxies.Validation:
git diff --checkpython3 Tools/cases_generator/tier1_generator.py -o <tmp> Python/bytecodes.cand compared output withPython/generated_cases.c.hpython3 Tools/cases_generator/tier2_generator.py -o <tmp> Python/bytecodes.cand compared output withPython/executor_cases.c.hpython3 Tools/cases_generator/tier1_generator.py --test -o <tmp> Python/bytecodes.cand compared output withModules/_testinternalcapi/test_cases.c.h./python -m test test_lazy_import