cmd/go: remove Package.Internal.Deps

Package.Internal.Imports is enough in nearly all cases,
and not maintaining a separate Package.Internal.Deps
avoids the two lists ending up out of sync.
(In some synthesized packages created during go test,
only Internal.Imports is initialized.)

Change-Id: I83f6a3ec6e6cbd75382f1fa0e439d31feec32d5a
Reviewed-on: https://go-review.googlesource.com/56278
Reviewed-by: Ian Lance Taylor <iant@golang.org>

src/cmd/go/internal/load/pkg.go

@@ -94,8 +94,7 @@ type PackageInternal struct {
 	// Unexported fields are not part of the public API.
 	Build        *build.Package
 	Pkgdir       string     // overrides build.PkgDir
-	Imports      []*Package
+	Imports      []*Package // this package's direct imports
-	Deps         []*Package
 	GoFiles      []string   // GoFiles+CgoFiles+TestGoFiles+XTestGoFiles files, absolute paths
 	SFiles       []string
 	AllGoFiles   []string             // gofiles + IgnoredGoFiles, absolute paths
@@ -1086,7 +1085,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
 
 		save(path, p1)
 		imports = append(imports, p1)
-		for _, dep := range p1.Internal.Deps {
+		for _, dep := range p1.Internal.Imports {
 			save(dep.ImportPath, dep)
 		}
 		if p1.Incomplete {
@@ -1105,7 +1104,6 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
 		if p1 == nil {
 			panic("impossible: missing entry in package cache for " + dep + " imported by " + p.ImportPath)
 		}
-		p.Internal.Deps = append(p.Internal.Deps, p1)
 		if p1.Error != nil {
 			p.DepsErrors = append(p.DepsErrors, p1.Error)
 		}
@@ -1164,6 +1162,29 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
 	return p
 }
 
+// InternalDeps returns the full dependency list for p,
+// built by traversing p.Internal.Imports, their .Internal.Imports, and so on.
+// It guarantees that the returned list has only one package per ImportPath
+// and that "test" copies of a package are returned in preference to "real" ones.
+func (p *Package) InternalDeps() []*Package {
+	// Note: breadth-first search here to ensure that test-augmented copies
+	// of a package under test are found before the "real" ones
+	// (the real ones are deeper in the import graph).
+	// Since we're building the slice anyway, it doesn't cost anything.
+	all := []*Package{p}
+	have := map[string]bool{p.ImportPath: true, "unsafe": true}
+	// Note: Not a range loop because all is growing during the loop.
+	for i := 0; i < len(all); i++ {
+		for _, p1 := range all[i].Internal.Imports {
+			if !have[p1.ImportPath] {
+				have[p1.ImportPath] = true
+				all = append(all, p1)
+			}
+		}
+	}
+	return all[1:] // slice off p itself
+}
+
 // usesSwig reports whether the package needs to run SWIG.
 func (p *Package) UsesSwig() bool {
 	return len(p.SwigFiles) > 0 || len(p.SwigCXXFiles) > 0
@@ -1531,7 +1552,7 @@ func isStale(p *Package) (bool, string) {
 	}
 
 	// Package is stale if a dependency is.
-	for _, p1 := range p.Internal.Deps {
+	for _, p1 := range p.Internal.Imports {
 		if p1.Stale {
 			return true, "stale dependency"
 		}
@@ -1569,7 +1590,7 @@ func isStale(p *Package) (bool, string) {
 	}
 
 	// Package is stale if a dependency is, or if a dependency is newer.
-	for _, p1 := range p.Internal.Deps {
+	for _, p1 := range p.Internal.Imports {
 		if p1.Internal.Target != "" && olderThan(p1.Internal.Target) {
 			return true, "newer dependency"
 		}
@@ -1700,7 +1721,7 @@ func computeBuildID(p *Package) {
 	// people use the same GOPATH but switch between
 	// different Go releases. See issue 10702.
 	// This is also a better fix for issue 8290.
-	for _, p1 := range p.Internal.Deps {
+	for _, p1 := range p.Internal.Imports {
 		fmt.Fprintf(h, "dep %s %s\n", p1.ImportPath, p1.Internal.BuildID)
 	}
 

src/cmd/go/internal/test/test.go

@@ -676,7 +676,7 @@ func runTest(cmd *base.Command, args []string) {
 
 // ensures that package p imports the named package
 func ensureImport(p *load.Package, pkg string) {
-	for _, d := range p.Internal.Deps {
+	for _, d := range p.Internal.Imports {
 		if d.Name == pkg {
 			return
 		}
@@ -1107,13 +1107,7 @@ func recompileForTest(pmain, preal, ptest *load.Package, testDir string) {
 			}
 		}
 
-		// Update p.Deps and p.Internal.Imports to use at test copies.
+		// Update p.Internal.Imports to use test copies.
-		for i, dep := range p.Internal.Deps {
-			if p1 := testCopy[dep]; p1 != nil && p1 != dep {
-				split()
-				p.Internal.Deps[i] = p1
-			}
-		}
 		for i, imp := range p.Internal.Imports {
 			if p1 := testCopy[imp]; p1 != nil && p1 != imp {
 				split()