cmd/go: use Builder.writeFile more extensively

Change-Id: Id9dfbb788194e1de5d55daba40dc9f34fd36180c
Reviewed-on: https://go-review.googlesource.com/c/go/+/534656
Auto-Submit: Austin Clements <austin@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/cmd/go/internal/work/buildid.go b/src/cmd/go/internal/work/buildid.go
index 953d4679cd0125dec5962c4bba1bcfee17d0652e..86be229c16311318902d027f5ce9fb9099df6c5b 100644 (file)
--- a/src/cmd/go/internal/work/buildid.go
+++ b/src/cmd/go/internal/work/buildid.go
@@ -343,16 +343,7 @@ func (b *Builder) gccgoBuildIDFile(a *Action) (string, error) {
                fmt.Fprintf(&buf, "\t"+`.section .note.GNU-split-stack,"",%s`+"\n", secType)
        }
 
-       if cfg.BuildN || cfg.BuildX {
-               for _, line := range bytes.Split(buf.Bytes(), []byte("\n")) {
-                       b.Showcmd("", "echo '%s' >> %s", line, sfile)
-               }
-               if cfg.BuildN {
-                       return sfile, nil
-               }
-       }
-
-       if err := os.WriteFile(sfile, buf.Bytes(), 0666); err != nil {
+       if err := b.writeFile(sfile, buf.Bytes()); err != nil {
                return "", err
        }
 

diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
index 51ce35c0c9dce4f31aaf810de68ff446d78fe1f5..69c27be53a605cbb8b5e3701184cb600af94dd22 100644 (file)
--- a/src/cmd/go/internal/work/exec.go
+++ b/src/cmd/go/internal/work/exec.go
@@ -1674,19 +1674,13 @@ func (b *Builder) installShlibname(ctx context.Context, a *Action) error {
                return err
        }
 
-       // TODO: BuildN
        a1 := a.Deps[0]
-       if err := b.Mkdir(filepath.Dir(a.Target)); err != nil {
-               return err
-       }
-       err := os.WriteFile(a.Target, []byte(filepath.Base(a1.Target)+"\n"), 0666)
-       if err != nil {
-               return err
-       }
-       if cfg.BuildX {
-               b.Showcmd("", "echo '%s' > %s # internal", filepath.Base(a1.Target), a.Target)
+       if !cfg.BuildN {
+               if err := b.Mkdir(filepath.Dir(a.Target)); err != nil {
+                       return err
+               }
        }
-       return nil
+       return b.writeFile(a.Target, []byte(filepath.Base(a1.Target)+"\n"))
 }
 
 func (b *Builder) linkSharedActionID(a *Action) cache.ActionID {
@@ -1991,7 +1985,16 @@ func (b *Builder) CopyFile(dst, src string, perm fs.FileMode, force bool) error
 // writeFile writes the text to file.
 func (b *Builder) writeFile(file string, text []byte) error {
        if cfg.BuildN || cfg.BuildX {
-               b.Showcmd("", "cat >%s << 'EOF' # internal\n%sEOF", file, text)
+               switch {
+               case len(text) == 0:
+                       b.Showcmd("", "echo -n > %s # internal", file)
+               case bytes.IndexByte(text, '\n') == len(text)-1:
+                       // One line. Use a simpler "echo" command.
+                       b.Showcmd("", "echo '%s' > %s # internal", bytes.TrimSuffix(text, []byte("\n")), file)
+               default:
+                       // Use the most general form.
+                       b.Showcmd("", "cat >%s << 'EOF' # internal\n%sEOF", file, text)
+               }
        }
        if cfg.BuildN {
                return nil
@@ -3273,13 +3276,8 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo
        flagLists := [][]string{cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS}
        if flagsNotCompatibleWithInternalLinking(flagSources, flagLists) {
                tokenFile := objdir + "preferlinkext"
-               if cfg.BuildN || cfg.BuildX {
-                       b.Showcmd("", "echo > %s", tokenFile)
-               }
-               if !cfg.BuildN {
-                       if err := os.WriteFile(tokenFile, nil, 0666); err != nil {
-                               return nil, nil, err
-                       }
+               if err := b.writeFile(tokenFile, nil); err != nil {
+                       return nil, nil, err
                }
                outObj = append(outObj, tokenFile)
        }
@@ -3612,13 +3610,8 @@ func (b *Builder) dynimport(a *Action, p *load.Package, objdir, importGo, cgoExe
                // cmd/link explicitly looks for the name "dynimportfail".
                // See issue #52863.
                fail := objdir + "dynimportfail"
-               if cfg.BuildN || cfg.BuildX {
-                       b.Showcmd("", "echo > %s", fail)
-               }
-               if !cfg.BuildN {
-                       if err := os.WriteFile(fail, nil, 0666); err != nil {
-                               return "", "", err
-                       }
+               if err := b.writeFile(fail, nil); err != nil {
+                       return "", "", err
                }
                return "", fail, nil
        }