cmd/go: replace a.Package.Internal.Pkgfile with a.built

Logically the build needs to start treating a.Package as immutable,
since we might want to build a.Package multiple ways.
Record the built target in a.built instead.

Right now a.built is predictable ahead of time, but we want to
move toward satisfying some builds from a cache directory,
in which case a.built will point into the cache directory
and not be determined until action execution time.

There is probably more to do with shared libraries, but this
does not break what's there.

Change-Id: I941988b520bee2f664fd8cabccf389e1dc29628b
Reviewed-on: https://go-review.googlesource.com/69050
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index 62a99ca41a2e9726198eb229a1b4d62b85dcda89..4bbf3e65ea18d5ae205216637b335e7156fbb761 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -95,7 +95,6 @@ type PackageInternal struct {
        Build        *build.Package
        Imports      []*Package           // this package's direct imports
        Target       string               // installed file for this package (may be executable)
-       Pkgfile      string               // where package will be (or is already) built or installed
        ForceLibrary bool                 // this package is a library (even if named "main")
        Cmdline      bool                 // defined by files listed on command line
        Local        bool                 // imported via local path (./ or ../)
@@ -1173,29 +1172,6 @@ func (p *Package) InternalAllGoFiles() []string {
        return p.mkAbs(str.StringList(extra, p.GoFiles, p.CgoFiles, p.TestGoFiles, p.XTestGoFiles))
 }
 
-// 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

diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
index db1cca5102fcd359d2cc0083cfff05fd750fc896..e20696120d1a67ad57c89479e3391e233a995bac 100644 (file)
--- a/src/cmd/go/internal/work/build.go
+++ b/src/cmd/go/internal/work/build.go
@@ -688,6 +688,7 @@ type Action struct {
        // Generated files, directories.
        Objdir string // directory for intermediate objects
        Target string // goal of the action: the created package or executable
+       built  string // the actual created package or executable
 
        // Execution state.
        pending  int  // number of deps yet to complete
@@ -707,7 +708,7 @@ type actionJSON struct {
        Target     string   `json:",omitempty"`
        Priority   int      `json:",omitempty"`
        Failed     bool     `json:",omitempty"`
-       Pkgfile    string   `json:",omitempty"`
+       Built      string   `json:",omitempty"`
 }
 
 // cacheKey is the key for the action cache.
@@ -746,11 +747,11 @@ func actionGraphJSON(a *Action) string {
                        Target:     a.Target,
                        Failed:     a.Failed,
                        Priority:   a.priority,
+                       Built:      a.built,
                }
                if a.Package != nil {
                        // TODO(rsc): Make this a unique key for a.Package somehow.
                        aj.Package = a.Package.ImportPath
-                       aj.Pkgfile = a.Package.Internal.Pkgfile
                }
                for _, a1 := range a.Deps {
                        aj.Deps = append(aj.Deps, inWorkq[a1])
@@ -900,7 +901,7 @@ func (b *Builder) CompileAction(mode, depMode BuildMode, p *load.Package) *Actio
                        Objdir:  b.NewObjdir(),
                }
                a.Target = a.Objdir + "_pkg_.a"
-               a.Package.Internal.Pkgfile = a.Target
+               a.built = a.Target
 
                for _, p1 := range p.Internal.Imports {
                        a.Deps = append(a.Deps, b.CompileAction(depMode, depMode, p1))
@@ -931,7 +932,7 @@ func (b *Builder) CompileAction(mode, depMode BuildMode, p *load.Package) *Actio
                        a.Mode = "use installed"
                        a.Target = p.Internal.Target
                        a.Func = nil
-                       p.Internal.Pkgfile = a.Target
+                       a.built = a.Target
                        return a
                }
                return a
@@ -962,7 +963,7 @@ func (b *Builder) LinkAction(mode, depMode BuildMode, p *load.Package) *Action {
                        a.Mode = "use installed"
                        a.Func = nil
                        a.Target = p.Internal.Target
-                       p.Internal.Pkgfile = a.Target
+                       a.built = a.Target
                        return a
                }
 
@@ -992,6 +993,7 @@ func (b *Builder) LinkAction(mode, depMode BuildMode, p *load.Package) *Action {
                        _, name = filepath.Split(p.Internal.Target)
                }
                a.Target = a.Objdir + filepath.Join("exe", name) + cfg.ExeSuffix
+               a.built = a.Target
                b.addTransitiveLinkDeps(a, a1, "")
                return a
        })
@@ -1021,8 +1023,8 @@ func (b *Builder) installAction(a1 *Action) *Action {
                        Objdir:  a1.Objdir,
                        Deps:    []*Action{a1},
                        Target:  p.Internal.Target,
+                       built:   p.Internal.Target,
                }
-               p.Internal.Pkgfile = a.Target
                b.addInstallHeaderAction(a)
                return a
        })
@@ -1591,7 +1593,12 @@ func (b *Builder) build(a *Action) (err error) {
 
        // Prepare Go import config.
        var icfg bytes.Buffer
-       for _, path := range a.Package.Imports {
+       for _, a1 := range a.Deps {
+               p1 := a1.Package
+               if p1 == nil || p1.ImportPath == "" {
+                       continue
+               }
+               path := p1.ImportPath
                i := strings.LastIndex(path, "/vendor/")
                if i >= 0 {
                        i += len("/vendor/")
@@ -1602,15 +1609,12 @@ func (b *Builder) build(a *Action) (err error) {
                }
                fmt.Fprintf(&icfg, "importmap %s=%s\n", path[i:], path)
        }
-       for _, p1 := range a.Package.Internal.Imports {
-               if p1.ImportPath == "unsafe" {
-                       continue
-               }
-               if p1.Internal.Pkgfile == "" {
-                       // This happens for gccgo-internal packages like runtime.
+       for _, a1 := range a.Deps {
+               p1 := a1.Package
+               if p1 == nil || p1.ImportPath == "" || a1.built == "" {
                        continue
                }
-               fmt.Fprintf(&icfg, "packagefile %s=%s\n", p1.ImportPath, p1.Internal.Pkgfile)
+               fmt.Fprintf(&icfg, "packagefile %s=%s\n", p1.ImportPath, a1.built)
        }
 
        // Compile Go.
@@ -1728,7 +1732,7 @@ func (b *Builder) writeLinkImportcfg(a *Action, file string) error {
                if p1 == nil {
                        continue
                }
-               fmt.Fprintf(&icfg, "packagefile %s=%s\n", p1.ImportPath, p1.Internal.Pkgfile)
+               fmt.Fprintf(&icfg, "packagefile %s=%s\n", p1.ImportPath, a1.built)
                if p1.Shlib != "" {
                        fmt.Fprintf(&icfg, "packageshlib %s=%s\n", p1.ImportPath, p1.Shlib)
                }