assingment in nil map

thought-machine · Jan 20, 2025 · ad5165e · ad5165e
1 parent ecb1d37
commit ad5165e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/core/graph.go b/src/core/graph.go
@@ -151,9 +151,10 @@ func (graph *BuildGraph) PackageMap() map[string]*Package {
 // NewGraph constructs and returns a new BuildGraph.
 func NewGraph() *BuildGraph {
 	g := &BuildGraph{
-		targets:  cmap.New[BuildLabel, *BuildTarget](cmap.DefaultShardCount, hashBuildLabel),
-		packages: cmap.New[packageKey, *Package](cmap.DefaultShardCount, hashPackageKey),
-		subrepos: cmap.New[string, *Subrepo](cmap.SmallShardCount, cmap.XXHash),
+		targets:               cmap.New[BuildLabel, *BuildTarget](cmap.DefaultShardCount, hashBuildLabel),
+		packages:              cmap.New[packageKey, *Package](cmap.DefaultShardCount, hashPackageKey),
+		subrepos:              cmap.New[string, *Subrepo](cmap.SmallShardCount, cmap.XXHash),
+		subincludeSubincludes: map[BuildLabel][]BuildLabel{},
 	}
 	return g
 }

diff --git a/src/parse/asp/builtins.go b/src/parse/asp/builtins.go
@@ -405,9 +405,7 @@ func subincludeTarget(s *scope, l core.BuildLabel) *core.BuildTarget {
 	}
 
 	t := s.WaitForSubincludedTarget(l, pkgLabel)
-
-	// TODO(jpoole): when pkg is nil, that means this subinclude was made by another subinclude. We're currently loosing
-	// this information here. We probably need a way to transitively record the subincludes.
+
 	if s.pkg != nil {
 		s.pkg.RegisterSubinclude(l)
 	} else {