Merge remote-tracking branch 'upstream/master'

Author: actions-user

src/cmd/compile/internal/ssa/config.go

@@ -283,6 +283,7 @@ func NewConfig(arch string, types Types, ctxt *obj.Link, optimize, softfloat boo
 		c.FPReg = framepointerRegLOONG64
 		c.LinkReg = linkRegLOONG64
 		c.hasGReg = true
+		c.unalignedOK = true
 	case "s390x":
 		c.PtrSize = 8
 		c.RegSize = 8

src/cmd/compile/internal/ssagen/ssa.go

@@ -317,7 +317,7 @@ func buildssa(fn *ir.Func, worker int, isPgoHot bool) *ssa.Func {
 	// optionally allows an ABI suffix specification in the GOSSAHASH, e.g. "(*Reader).Reset<0>" etc
 	if strings.Contains(ssaDump, name) { // in all the cases the function name is entirely contained within the GOSSAFUNC string.
 		nameOptABI := name
-		if strings.Contains(ssaDump, ",") { // ABI specification
+		if l := len(ssaDump); l > 1 && ssaDump[l-2] == ',' { // ABI specification
 			nameOptABI = ssa.FuncNameABI(name, abiSelf.Which())
 		} else if strings.HasSuffix(ssaDump, ">") { // if they use the linker syntax instead....
 			l := len(ssaDump)

src/cmd/go/alldocs.go

@@ -78,26 +78,27 @@ func DefaultDir() (string, bool, error) {
 	// otherwise distinguish between an explicit "off" and a UserCacheDir error.
 
 	defaultDirOnce.Do(func() {
-		defaultDir = cfg.Getenv("GOCACHE")
-		if defaultDir != "" {
-			defaultDirChanged = true
-			if filepath.IsAbs(defaultDir) || defaultDir == "off" {
-				return
-			}
-			defaultDir = "off"
-			defaultDirErr = fmt.Errorf("GOCACHE is not an absolute path")
-			return
-		}
-
 		// Compute default location.
 		dir, err := os.UserCacheDir()
 		if err != nil {
 			defaultDir = "off"
-			defaultDirChanged = true
 			defaultDirErr = fmt.Errorf("GOCACHE is not defined and %v", err)
+		} else {
+			defaultDir = filepath.Join(dir, "go-build")
+		}
+
+		newDir := cfg.Getenv("GOCACHE")
+		if newDir != "" {
+			defaultDirErr = nil
+			defaultDirChanged = newDir != defaultDir
+			defaultDir = newDir
+			if filepath.IsAbs(defaultDir) || defaultDir == "off" {
+				return
+			}
+			defaultDir = "off"
+			defaultDirErr = fmt.Errorf("GOCACHE is not an absolute path")
 			return
 		}
-		defaultDir = filepath.Join(dir, "go-build")
 	})
 
 	return defaultDir, defaultDirChanged, defaultDirErr

src/cmd/go/internal/cache/default.go

@@ -22,8 +22,7 @@ must not already exist.
 
 Init accepts one optional argument, the module path for the new module. If the
 module path argument is omitted, init will attempt to infer the module path
-using import comments in .go files, vendoring tool configuration files (like
-Gopkg.lock), and the current directory (if in GOPATH).
+using import comments in .go files and the current directory (if in GOPATH).
 
 See https://golang.org/ref/mod#go-mod-init for more about 'go mod init'.
 `,

src/cmd/go/internal/modcmd/init.go

@@ -110,9 +110,7 @@ type RevInfo struct {
 // introduced, if a path p resolves using the pre-module "go get" lookup
 // to the root of a source code repository without a go.mod file,
 // that repository is treated as if it had a go.mod in its root directory
-// declaring module path p. (The go.mod is further considered to
-// contain requirements corresponding to any legacy version
-// tracking format such as Gopkg.lock, vendor/vendor.conf, and so on.)
+// declaring module path p.
 //
 // The presentation so far ignores the fact that a source code repository
 // has many different versions of a file tree, and those versions may

src/cmd/go/internal/modfetch/repo.go

@@ -67,6 +67,11 @@ env GOROOT=./b
 go env -changed
 ! stdout 'GOTOOLCHAIN=''?local''?'
 
+[GOOS:windows] env LocalAppData=C:\
+[GOOS:windows] env GOCACHE=C:\go-build
+[GOOS:windows] go env -changed
+[GOOS:windows] ! stdout 'GOCACHE'
+
 --  a/go.env --
 GOPROXY=s
 GOAMD64=v1

src/cmd/go/testdata/script/env_changed.txt

@@ -144,7 +144,7 @@ var ArchLoong64 = &Arch{
 	RegSize:        8,
 	MinLC:          4,
 	Alignment:      8, // Unaligned accesses are not guaranteed to be fast
-	CanMergeLoads:  false,
+	CanMergeLoads:  true,
 	HasLR:          true,
 	FixedFrameSize: 8, // LR
 }

src/cmd/internal/sys/arch.go

@@ -336,6 +336,10 @@ func (fd *FD) initIO() error {
 		return nil
 	}
 	fd.initIOOnce.Do(func() {
+		if fd.closing() {
+			// Closing, nothing to do.
+			return
+		}
 		// The runtime poller will ignore I/O completion
 		// notifications not initiated by this package,
 		// so it is safe to add handles owned by the caller.
@@ -434,6 +438,12 @@ func (fd *FD) Close() error {
 	if !fd.fdmu.increfAndClose() {
 		return errClosing(fd.isFile)
 	}
+	// There is a potential race between a concurrent call to fd.initIO,
+	// which calls fd.pd.init, and the call to fd.pd.evict below.
+	// This is solved by calling fd.initIO ourselves, which will
+	// block until the concurrent fd.initIO has completed. Note
+	// that fd.initIO is no-op if first called from here.
+	fd.initIO()
 	if fd.kind == kindPipe {
 		syscall.CancelIoEx(fd.Sysfd, nil)
 	}

src/internal/poll/fd_windows.go

@@ -68,7 +68,7 @@ func cloneMultipartForm(f *multipart.Form) *multipart.Form {
 		Value: (map[string][]string)(Header(f.Value).Clone()),
 	}
 	if f.File != nil {
-		m := make(map[string][]*multipart.FileHeader)
+		m := make(map[string][]*multipart.FileHeader, len(f.File))
 		for k, vv := range f.File {
 			vv2 := make([]*multipart.FileHeader, len(vv))
 			for i, v := range vv {