Skip to content

fix(query.deps): memoize provided labels rather than declared targets #3369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tatskaari merged 1 commit into from
May 29, 2025
Merged

fix(query.deps): memoize provided labels rather than declared targets #3369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/query/deps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Deps(out io.Writer, state *core.BuildState, labels []core.BuildLabel, hidde
fmt.Fprintf(out, " edge [fontname=\"Helvetica,Arial,sans-serif\"]\n")
fmt.Fprintf(out, " rankdir=\"LR\"\n")
}
done := map[*core.BuildTarget]bool{}
done := map[core.BuildLabel]bool{}
for _, label := range labels {
deps(out, state, state.Graph.TargetOrDie(label), done, targetLevel, 0, hidden, formatdot)
}
Expand All @@ -27,17 +27,17 @@ func Deps(out io.Writer, state *core.BuildState, labels []core.BuildLabel, hidde
}

// deps looks at all the deps of the given target & recurses into them, printing as appropriate.
func deps(out io.Writer, state *core.BuildState, target *core.BuildTarget, done map[*core.BuildTarget]bool, targetLevel, currentLevel int, hidden, formatdot bool) {
func deps(out io.Writer, state *core.BuildState, target *core.BuildTarget, done map[core.BuildLabel]bool, targetLevel, currentLevel int, hidden, formatdot bool) {
if currentLevel == targetLevel {
return
}
for _, l := range target.DeclaredDependencies() {
dep := state.Graph.TargetOrDie(l)
if !state.ShouldInclude(dep) || done[dep] {
continue // target is filtered out
}
done[dep] = true
for _, l := range dep.ProvideFor(target) {
if !state.ShouldInclude(dep) || done[l] {
continue // target is filtered out
}
done[l] = true
if dep := state.Graph.TargetOrDie(l); hidden || !dep.HasParent() {
// dep is to be printed; either we're printing hidden deps or it has no parent (i.e. is not hidden)
if formatdot {
Expand Down
Loading