Fix potential subinclude lockup #3305
Merged
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
Tatskaari
reviewed
Dec 3, 2024
| @@ -1029,6 +1031,9 @@ func (state *BuildState) ActivateTarget(pkg *Package, label, dependent BuildLabe | |||
| if state.ParsePackageOnly && !mode.IsForSubinclude() { | |||
| return nil // Some kinds of query don't need a full recursive parse. | |||
| } else if label.IsAllTargets() { | |||
| if pkg == nil { | |||
There was a problem hiding this comment.
I changed the condition in builtins.go to allow it to continue to activate the target even if the pkg is nil. That happens when we subinclude from inside a subinclude; they don't have a package set when we're executing them.
Tatskaari
approved these changes
Dec 3, 2024
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.
Think we have an issue in here where
isLocal == trueands.pkg == nil; we never activate the target and it never gets built. This happens in the attached test repo when going through//abecause of the double-subinclude; it works okay if the subinclude from//cgets there first (because then we are specifically parsing for that target which gets handled elsewhere).I think this is a reasonably tactical fix; we don't really need the package in this case, it's only used for:
:alltargets which you can't subinclude anywaysubinclude()