Move @AnnotatedFor check to BaseTypeChecker#24
Merged
aosen-xiong merged 2 commits intoApr 30, 2026
Merged
Conversation
3bd4f0a to
7fe7635
Compare
7fe7635 to
839542d
Compare
e91b31e
into
aosen-xiong:code-refactor-annotatedfor
50 checks passed
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.
This is a follow-up to the
@AnnotatedForrefactor in eisop#1331. It keeps the shared@AnnotatedForscope computation, but moves ownership of the recursive/cached scope check out ofAnnotatedTypeFactoryand intoBaseTypeChecker.This was previously blocked by
QualifierDefaultscalling intoBaseTypeCheckerbefore normal checker/type-factory initialization was complete, as discussed here. The concrete failure path comes from stub/ajava parsing during type factorypostInit():At that point, routing through the checker can cause an NPE because
getTypeFactory()depends on the visitor, which is not available yet.This PR avoids that by skipping conservative unchecked-code
@AnnotatedForlookup while stub/ajava parsing is active. This does not change the existing policy for stub-file elements:QualifierDefaultscurrently treats stub files as checked code, see comment here. That existing block handles elements after they are known to come from parsed stub files. The new guard handles the earlier phase where annotation-file metadata is still being parsed.Most stubs, including annotated-JDK class stubs, are only indexed during initialization and parsed lazily later, when an annotation lookup reaches that JDK class. The risky cases are the annotation files parsed eagerly during
postInit(), such as checker@StubFiles, command-line stubs, ajava files, and annotated-JDKpackage-info.javafiles.