Skip to content

Commit

Permalink
feat: update gofmt code from go1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
ldez committed Aug 16, 2024
1 parent 399ed8a commit b818f97
Show file tree
Hide file tree
Showing 19 changed files with 905 additions and 203 deletions.
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.PHONY: build build_gofmt build_goimports

default: build

build: build_gofmt build_goimports

build_gofmt:
go build ./gofmt

build_goimports:
go build ./goimports
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/golangci/gofmt

go 1.20
go 1.22

require (
golang.org/x/sync v0.7.0
golang.org/x/tools v0.18.0
golang.org/x/sync v0.8.0
golang.org/x/tools v0.24.0
)

require golang.org/x/mod v0.15.0 // indirect
require golang.org/x/mod v0.20.0 // indirect
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
2 changes: 2 additions & 0 deletions gofmt/internal/cfg/cfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const KnownEnv = `
GOARM
GOBIN
GOCACHE
GOCACHEPROG
GOENV
GOEXE
GOEXPERIMENT
Expand All @@ -59,6 +60,7 @@ const KnownEnv = `
GOROOT
GOSUMDB
GOTMPDIR
GOTOOLCHAIN
GOTOOLDIR
GOVCS
GOWASM
Expand Down
4 changes: 2 additions & 2 deletions gofmt/internal/diff/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ func Diff(oldName string, old []byte, newName string, new []byte) []byte {
continue
}

// Expand matching lines as far possible,
// Expand matching lines as far as possible,
// establishing that x[start.x:end.x] == y[start.y:end.y].
// Note that on the first (or last) iteration we may (or definitey do)
// Note that on the first (or last) iteration we may (or definitely do)
// have an empty match: start.x==end.x and start.y==end.y.
start := m
for start.x > done.x && start.y > done.y && x[start.x-1] == y[start.y-1] {
Expand Down
66 changes: 0 additions & 66 deletions gofmt/internal/goroot/importcfg.go

This file was deleted.

137 changes: 109 additions & 28 deletions gofmt/internal/platform/supported.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,19 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate go test . -run=^TestGenerated$ -fix

package platform

// An OSArch is a pair of GOOS and GOARCH values indicating a platform.
type OSArch struct {
GOOS, GOARCH string
}

func (p OSArch) String() string {
return p.GOOS + "/" + p.GOARCH
}

// RaceDetectorSupported reports whether goos/goarch supports the race
// detector. There is a copy of this function in cmd/dist/test.go.
// Race detector only supports 48-bit VMA on arm64. But it will always
Expand All @@ -24,11 +35,10 @@ func RaceDetectorSupported(goos, goarch string) bool {

// MSanSupported reports whether goos/goarch supports the memory
// sanitizer option.
// There is a copy of this function in misc/cgo/testsanitizers/cc_test.go.
func MSanSupported(goos, goarch string) bool {
switch goos {
case "linux":
return goarch == "amd64" || goarch == "arm64"
return goarch == "amd64" || goarch == "arm64" || goarch == "loong64"
case "freebsd":
return goarch == "amd64"
default:
Expand All @@ -38,11 +48,10 @@ func MSanSupported(goos, goarch string) bool {

// ASanSupported reports whether goos/goarch supports the address
// sanitizer option.
// There is a copy of this function in misc/cgo/testsanitizers/cc_test.go.
func ASanSupported(goos, goarch string) bool {
switch goos {
case "linux":
return goarch == "arm64" || goarch == "amd64" || goarch == "riscv64" || goarch == "ppc64le"
return goarch == "arm64" || goarch == "amd64" || goarch == "loong64" || goarch == "riscv64" || goarch == "ppc64le"
default:
return false
}
Expand Down Expand Up @@ -71,20 +80,12 @@ func FuzzInstrumented(goos, goarch string) bool {
}
}

// MustLinkExternal reports whether goos/goarch requires external linking.
func MustLinkExternal(goos, goarch string) bool {
return MustLinkExternalGo121(goos, goarch, false)
}

// MustLinkExternalGo121 reports whether goos/goarch requires external linking,
// with or without cgo dependencies. [This version back-ported from
// Go 1.21 as part of a test].
func MustLinkExternalGo121(goos, goarch string, withCgo bool) bool {
// MustLinkExternal reports whether goos/goarch requires external linking
// with or without cgo dependencies.
func MustLinkExternal(goos, goarch string, withCgo bool) bool {
if withCgo {
switch goarch {
case "loong64",
"mips", "mipsle", "mips64", "mips64le",
"riscv64":
case "loong64", "mips", "mipsle", "mips64", "mips64le":
// Internally linking cgo is incomplete on some architectures.
// https://go.dev/issue/14449
return true
Expand All @@ -96,7 +97,9 @@ func MustLinkExternalGo121(goos, goarch string, withCgo bool) bool {
case "ppc64":
// Big Endian PPC64 cgo internal linking is not implemented for aix or linux.
// https://go.dev/issue/8912
return true
if goos == "aix" || goos == "linux" {
return true
}
}

switch goos {
Expand Down Expand Up @@ -125,25 +128,48 @@ func MustLinkExternalGo121(goos, goarch string, withCgo bool) bool {

// BuildModeSupported reports whether goos/goarch supports the given build mode
// using the given compiler.
// There is a copy of this function in cmd/dist/test.go.
func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
if compiler == "gccgo" {
return true
}

platform := goos + "/" + goarch
if _, ok := distInfo[OSArch{goos, goarch}]; !ok {
return false // platform unrecognized
}

platform := goos + "/" + goarch
switch buildmode {
case "archive":
return true

case "c-archive":
// TODO(bcmills): This seems dubious.
// Do we really support c-archive mode on js/wasm‽
return platform != "linux/ppc64"
switch goos {
case "aix", "darwin", "ios", "windows":
return true
case "linux":
switch goarch {
case "386", "amd64", "arm", "armbe", "arm64", "arm64be", "loong64", "ppc64le", "riscv64", "s390x":
// linux/ppc64 not supported because it does
// not support external linking mode yet.
return true
default:
// Other targets do not support -shared,
// per ParseFlags in
// cmd/compile/internal/base/flag.go.
// For c-archive the Go tool passes -shared,
// so that the result is suitable for inclusion
// in a PIE or shared library.
return false
}
case "freebsd":
return goarch == "amd64"
}
return false

case "c-shared":
switch platform {
case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le", "linux/riscv64", "linux/s390x",
case "linux/amd64", "linux/arm", "linux/arm64", "linux/loong64", "linux/386", "linux/ppc64le", "linux/riscv64", "linux/s390x",
"android/amd64", "android/arm", "android/arm64", "android/386",
"freebsd/amd64",
"darwin/amd64", "darwin/arm64",
Expand All @@ -160,7 +186,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {

case "pie":
switch platform {
case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/riscv64", "linux/s390x",
case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/loong64", "linux/ppc64le", "linux/riscv64", "linux/s390x",
"android/amd64", "android/arm", "android/arm64", "android/386",
"freebsd/amd64",
"darwin/amd64", "darwin/arm64",
Expand All @@ -180,8 +206,8 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {

case "plugin":
switch platform {
case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/s390x", "linux/ppc64le",
"android/amd64", "android/arm", "android/arm64", "android/386",
case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/loong64", "linux/s390x", "linux/ppc64le",
"android/amd64", "android/386",
"darwin/amd64", "darwin/arm64",
"freebsd/amd64":
return true
Expand All @@ -195,11 +221,66 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {

func InternalLinkPIESupported(goos, goarch string) bool {
switch goos + "/" + goarch {
case "darwin/amd64", "darwin/arm64",
case "android/arm64",
"darwin/amd64", "darwin/arm64",
"linux/amd64", "linux/arm64", "linux/ppc64le",
"android/arm64",
"windows-amd64", "windows-386", "windows-arm":
"windows/386", "windows/amd64", "windows/arm", "windows/arm64":
return true
}
return false
}

// DefaultPIE reports whether goos/goarch produces a PIE binary when using the
// "default" buildmode. On Windows this is affected by -race,
// so force the caller to pass that in to centralize that choice.
func DefaultPIE(goos, goarch string, isRace bool) bool {
switch goos {
case "android", "ios":
return true
case "windows":
if isRace {
// PIE is not supported with -race on windows;
// see https://go.dev/cl/416174.
return false
}
return true
case "darwin":
return true
}
return false
}

// ExecutableHasDWARF reports whether the linked executable includes DWARF
// symbols on goos/goarch.
func ExecutableHasDWARF(goos, goarch string) bool {
switch goos {
case "plan9", "ios":
return false
}
return true
}

// osArchInfo describes information about an OSArch extracted from cmd/dist and
// stored in the generated distInfo map.
type osArchInfo struct {
CgoSupported bool
FirstClass bool
Broken bool
}

// CgoSupported reports whether goos/goarch supports cgo.
func CgoSupported(goos, goarch string) bool {
return distInfo[OSArch{goos, goarch}].CgoSupported
}

// FirstClass reports whether goos/goarch is considered a “first class” port.
// (See https://go.dev/wiki/PortingPolicy#first-class-ports.)
func FirstClass(goos, goarch string) bool {
return distInfo[OSArch{goos, goarch}].FirstClass
}

// Broken reportsr whether goos/goarch is considered a broken port.
// (See https://go.dev/wiki/PortingPolicy#broken-ports.)
func Broken(goos, goarch string) bool {
return distInfo[OSArch{goos, goarch}].Broken
}
Loading

0 comments on commit b818f97

Please sign in to comment.