qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-29 14:24:32 -06:00
Code Releases Activity

cmd/internal/sys: migrate support.go functions to new internal pkg

Browse Source 
Separate out the functions from cmd/internal/sys/support.go and
migrate them to a new package internal/platform, so that functions such as
"RaceDetectorSupported" can be called from tests in std as well as in
cmd. This isn't a complete move of everything in cmd/internal/sys;
there are still many functions left.

The original version of this CL (patch set 1) called the new package
"internal/sys", but for packages that needed both "internal/sys" and
"cmd/internal/sys" the import of the former had to be done with a
different name, which was confusing and also required a hack in
cmd/dist.

Updates #56006.

Change-Id: I866d62e75adbf3a640a06e2c7386a6e9e2a18d91
Reviewed-on: https://go-review.googlesource.com/c/go/+/438475
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Than McIntosh <thanm@google.com>
This commit is contained in:
Than McIntosh 2022-10-04 09:00:31 -04:00
parent dfd8aa461b
commit 8bd803fd4e
19 changed files with 42 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/compile/internal/base/flag.go
View File

@ -10,6 +10,7 @@ import (
"fmt"
"internal/buildcfg"
"internal/coverage"
"internal/platform"
"log"
"os"
"reflect"
@ -176,13 +177,13 @@ func ParseFlags() {
registerFlags()
objabi.Flagparse(usage)
if Flag.MSan && !sys.MSanSupported(buildcfg.GOOS, buildcfg.GOARCH) {
if Flag.MSan && !platform.MSanSupported(buildcfg.GOOS, buildcfg.GOARCH) {
log.Fatalf("%s/%s does not support -msan", buildcfg.GOOS, buildcfg.GOARCH)
}
if Flag.ASan && !sys.ASanSupported(buildcfg.GOOS, buildcfg.GOARCH) {
if Flag.ASan && !platform.ASanSupported(buildcfg.GOOS, buildcfg.GOARCH) {
log.Fatalf("%s/%s does not support -asan", buildcfg.GOOS, buildcfg.GOARCH)
}
if Flag.Race && !sys.RaceDetectorSupported(buildcfg.GOOS, buildcfg.GOARCH) {
if Flag.Race && !platform.RaceDetectorSupported(buildcfg.GOOS, buildcfg.GOARCH) {
log.Fatalf("%s/%s does not support -race", buildcfg.GOOS, buildcfg.GOARCH)
}
if (*Flag.Shared || *Flag.Dynlink || *Flag.LinkShared) && !Ctxt.Arch.InFamily(sys.AMD64, sys.ARM, sys.ARM64, sys.I386, sys.PPC64, sys.RISCV64, sys.S390X) {

1
src/cmd/dist/buildtool.go vendored
View File

@ -67,6 +67,7 @@ var bootstrapDirs = []string{
"internal/pkgbits",
"internal/race",
"internal/saferio",
"internal/platform",
"internal/unsafeheader",
"internal/xcoff",
"math/big",

2
src/cmd/dist/test.go vendored
View File

@ -1711,7 +1711,7 @@ func (t *tester) runPrecompiledStdTest(timeout time.Duration) error {
}
// raceDetectorSupported is a copy of the function
// cmd/internal/sys.RaceDetectorSupported, which can't be used here
// internal/platform.RaceDetectorSupported, which can't be used here
// because cmd/dist has to be buildable by Go 1.4.
// The race detector only supports 48-bit VMA on arm64. But we don't have
// a good solution to check VMA size(See https://golang.org/issue/29948)

11
src/cmd/go/go_test.go
View File

@ -14,6 +14,7 @@ import (
"fmt"
"go/format"
"internal/godebug"
"internal/platform"
"internal/testenv"
"io"
"io/fs"
@ -260,17 +261,17 @@ func TestMain(m *testing.M) {
}
testGOCACHE = strings.TrimSpace(string(out))
canMSan = canCgo && sys.MSanSupported(runtime.GOOS, runtime.GOARCH)
canASan = canCgo && sys.ASanSupported(runtime.GOOS, runtime.GOARCH)
canRace = canCgo && sys.RaceDetectorSupported(runtime.GOOS, runtime.GOARCH)
canMSan = canCgo && platform.MSanSupported(runtime.GOOS, runtime.GOARCH)
canASan = canCgo && platform.ASanSupported(runtime.GOOS, runtime.GOARCH)
canRace = canCgo && platform.RaceDetectorSupported(runtime.GOOS, runtime.GOARCH)
// The race detector doesn't work on Alpine Linux:
// golang.org/issue/14481
// gccgo does not support the race detector.
if isAlpineLinux() || runtime.Compiler == "gccgo" {
canRace = false
}
canFuzz = sys.FuzzSupported(runtime.GOOS, runtime.GOARCH)
fuzzInstrumented = sys.FuzzInstrumented(runtime.GOOS, runtime.GOARCH)
canFuzz = platform.FuzzSupported(runtime.GOOS, runtime.GOARCH)
fuzzInstrumented = platform.FuzzInstrumented(runtime.GOOS, runtime.GOARCH)
}
// Don't let these environment variables confuse the test.

4
src/cmd/go/internal/load/pkg.go
View File

@ -15,6 +15,7 @@ import (
"go/build"
"go/scanner"
"go/token"
"internal/platform"
"io/fs"
"os"
"os/exec"
@ -43,7 +44,6 @@ import (
"cmd/go/internal/trace"
"cmd/go/internal/vcs"
"cmd/internal/pkgpattern"
"cmd/internal/sys"
"golang.org/x/mod/modfile"
"golang.org/x/mod/module"
@ -2604,7 +2604,7 @@ func externalLinkingForced(p *Package) bool {
// -ldflags=-linkmode=external. External linking mode forces
// an import of runtime/cgo.
// If there are multiple -linkmode options, the last one wins.
pieCgo := cfg.BuildBuildmode == "pie" && !sys.InternalLinkPIESupported(cfg.BuildContext.GOOS, cfg.BuildContext.GOARCH)
pieCgo := cfg.BuildBuildmode == "pie" && !platform.InternalLinkPIESupported(cfg.BuildContext.GOOS, cfg.BuildContext.GOARCH)
linkmodeExternal := false
if p != nil {
ldflags := BuildLdflags.For(p)

4
src/cmd/go/internal/test/test.go
View File

@ -9,6 +9,7 @@ import (
"context"
"errors"
"fmt"
"internal/platform"
"io"
"io/fs"
"os"
@ -30,7 +31,6 @@ import (
"cmd/go/internal/str"
"cmd/go/internal/trace"
"cmd/go/internal/work"
"cmd/internal/sys"
"cmd/internal/test2json"
"golang.org/x/mod/module"
@ -664,7 +664,7 @@ func runTest(ctx context.Context, cmd *base.Command, args []string) {
base.Fatalf("cannot use -o flag with multiple packages")
}
if testFuzz != "" {
if !sys.FuzzSupported(cfg.Goos, cfg.Goarch) {
if !platform.FuzzSupported(cfg.Goos, cfg.Goarch) {
base.Fatalf("-fuzz flag is not supported on %s/%s", cfg.Goos, cfg.Goarch)
}
if len(pkgs) != 1 {

4
src/cmd/go/internal/work/gc.go
View File

@ -8,6 +8,7 @@ import (
"bufio"
"bytes"
"fmt"
"internal/platform"
"io"
"log"
"os"
@ -22,7 +23,6 @@ import (
"cmd/go/internal/str"
"cmd/internal/objabi"
"cmd/internal/quoted"
"cmd/internal/sys"
"crypto/sha1"
)
@ -640,7 +640,7 @@ func (gcToolchain) ld(b *Builder, root *Action, out, importcfg, mainpkg string)
// linker's build id, which will cause our build id to not
// match the next time the tool is built.
// Rely on the external build id instead.
if !sys.MustLinkExternal(cfg.Goos, cfg.Goarch) {
if !platform.MustLinkExternal(cfg.Goos, cfg.Goarch) {
ldflags = append(ldflags, "-X=cmd/internal/objabi.buildID="+root.buildID)
}
}

14
src/cmd/go/internal/work/init.go
View File

@ -13,8 +13,8 @@ import (
"cmd/go/internal/fsys"
"cmd/go/internal/modload"
"cmd/internal/quoted"
"cmd/internal/sys"
"fmt"
"internal/platform"
"os"
"os/exec"
"path/filepath"
@ -93,7 +93,7 @@ func BuildInit() {
// instrumentation is added. 'go test -fuzz' still works without coverage,
// but it generates random inputs without guidance, so it's much less effective.
func fuzzInstrumentFlags() []string {
if !sys.FuzzInstrumented(cfg.Goos, cfg.Goarch) {
if !platform.FuzzInstrumented(cfg.Goos, cfg.Goarch) {
return nil
}
return []string{"-d=libfuzzer"}
@ -118,17 +118,17 @@ func instrumentInit() {
base.SetExitStatus(2)
base.Exit()
}
if cfg.BuildMSan && !sys.MSanSupported(cfg.Goos, cfg.Goarch) {
if cfg.BuildMSan && !platform.MSanSupported(cfg.Goos, cfg.Goarch) {
fmt.Fprintf(os.Stderr, "-msan is not supported on %s/%s\n", cfg.Goos, cfg.Goarch)
base.SetExitStatus(2)
base.Exit()
}
if cfg.BuildRace && !sys.RaceDetectorSupported(cfg.Goos, cfg.Goarch) {
if cfg.BuildRace && !platform.RaceDetectorSupported(cfg.Goos, cfg.Goarch) {
fmt.Fprintf(os.Stderr, "-race is not supported on %s/%s\n", cfg.Goos, cfg.Goarch)
base.SetExitStatus(2)
base.Exit()
}
if cfg.BuildASan && !sys.ASanSupported(cfg.Goos, cfg.Goarch) {
if cfg.BuildASan && !platform.ASanSupported(cfg.Goos, cfg.Goarch) {
fmt.Fprintf(os.Stderr, "-asan is not supported on %s/%s\n", cfg.Goos, cfg.Goarch)
base.SetExitStatus(2)
base.Exit()
@ -299,12 +299,12 @@ func buildModeInit() {
base.Fatalf("buildmode=%s not supported", cfg.BuildBuildmode)
}
if !sys.BuildModeSupported(cfg.BuildToolchainName, cfg.BuildBuildmode, cfg.Goos, cfg.Goarch) {
if !platform.BuildModeSupported(cfg.BuildToolchainName, cfg.BuildBuildmode, cfg.Goos, cfg.Goarch) {
base.Fatalf("-buildmode=%s not supported on %s/%s\n", cfg.BuildBuildmode, cfg.Goos, cfg.Goarch)
}
if cfg.BuildLinkshared {
if !sys.BuildModeSupported(cfg.BuildToolchainName, "shared", cfg.Goos, cfg.Goarch) {
if !platform.BuildModeSupported(cfg.BuildToolchainName, "shared", cfg.Goos, cfg.Goarch) {
base.Fatalf("-linkshared not supported on %s/%s\n", cfg.Goos, cfg.Goarch)
}
if gccgo {

4
src/cmd/go/script_test.go
View File

@ -15,6 +15,7 @@ import (
"fmt"
"go/build"
"internal/buildcfg"
"internal/platform"
"internal/testenv"
"internal/txtar"
"io/fs"
@ -35,7 +36,6 @@ import (
"cmd/go/internal/par"
"cmd/go/internal/robustio"
"cmd/go/internal/work"
"cmd/internal/sys"
)
var testSum = flag.String("testsum", "", `may be tidy, listm, or listall. If set, TestScript generates a go.sum file at the beginning of each test and updates test files if they pass.`)
@ -459,7 +459,7 @@ Script:
break
}
if value, found := strings.CutPrefix(cond.tag, "buildmode:"); found {
ok = sys.BuildModeSupported(runtime.Compiler, value, runtime.GOOS, runtime.GOARCH)
ok = platform.BuildModeSupported(runtime.Compiler, value, runtime.GOOS, runtime.GOARCH)
break
}
if strings.HasPrefix(cond.tag, "GOEXPERIMENT:") {

18
src/cmd/internal/sys/supported_test.go
View File

@ -1,18 +0,0 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package sys
import (
"internal/testenv"
"runtime"
"testing"
)
func TestMustLinkExternalMatchesTestenv(t *testing.T) {
// MustLinkExternal and testenv.CanInternalLink are the exact opposite.
if b := MustLinkExternal(runtime.GOOS, runtime.GOARCH); b != !testenv.CanInternalLink() {
t.Fatalf("MustLinkExternal() == %v, testenv.CanInternalLink() == %v, don't match", b, testenv.CanInternalLink())
}
}

5
src/cmd/link/elf_test.go
View File

@ -10,6 +10,7 @@ package main
import (
"debug/elf"
"fmt"
"internal/platform"
"internal/testenv"
"os"
"os/exec"
@ -19,8 +20,6 @@ import (
"sync"
"testing"
"text/template"
"cmd/internal/sys"
)
func getCCAndCCFLAGS(t *testing.T, env []string) (string, []string) {
@ -280,7 +279,7 @@ func TestPIESize(t *testing.T) {
// always skip the test if cgo is not supported.
testenv.MustHaveCGO(t)
if !sys.BuildModeSupported(runtime.Compiler, "pie", runtime.GOOS, runtime.GOARCH) {
if !platform.BuildModeSupported(runtime.Compiler, "pie", runtime.GOOS, runtime.GOARCH) {
t.Skip("-buildmode=pie not supported")
}

3
src/cmd/link/internal/ld/config.go
View File

@ -8,6 +8,7 @@ import (
"cmd/internal/sys"
"fmt"
"internal/buildcfg"
"internal/platform"
)
// A BuildMode indicates the sort of object we are building.
@ -185,7 +186,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) {
}()
}
if sys.MustLinkExternal(buildcfg.GOOS, buildcfg.GOARCH) {
if platform.MustLinkExternal(buildcfg.GOOS, buildcfg.GOARCH) {
return true, fmt.Sprintf("%s/%s requires external linking", buildcfg.GOOS, buildcfg.GOARCH)
}

5
src/cmd/link/link_test.go
View File

@ -9,6 +9,7 @@ import (
"bytes"
"debug/macho"
"internal/buildcfg"
"internal/platform"
"internal/testenv"
"os"
"os/exec"
@ -17,8 +18,6 @@ import (
"runtime"
"strings"
"testing"
"cmd/internal/sys"
)
var AuthorPaidByTheColumnInch struct {
@ -976,7 +975,7 @@ func main() {
func TestIssue42396(t *testing.T) {
testenv.MustHaveGoBuild(t)
if !sys.RaceDetectorSupported(runtime.GOOS, runtime.GOARCH) {
if !platform.RaceDetectorSupported(runtime.GOOS, runtime.GOARCH) {
t.Skip("no race detector support")
}

4
src/cmd/objdump/objdump_test.go
View File

@ -6,10 +6,10 @@ package main
import (
"cmd/internal/notsha256"
"cmd/internal/sys"
"flag"
"fmt"
"go/build"
"internal/platform"
"internal/testenv"
"os"
"os/exec"
@ -287,7 +287,7 @@ func TestDisasmExtld(t *testing.T) {
}
func TestDisasmPIE(t *testing.T) {
if !sys.BuildModeSupported("gc", "pie", runtime.GOOS, runtime.GOARCH) {
if !platform.BuildModeSupported("gc", "pie", runtime.GOOS, runtime.GOARCH) {
t.Skipf("skipping on %s/%s, PIE buildmode not supported", runtime.GOOS, runtime.GOARCH)
}
t.Parallel()

4
src/go/build/deps_test.go
View File

@ -44,7 +44,7 @@ var depsRules = `
internal/coverage/uleb128, internal/coverage/calloc,
internal/cpu, internal/goarch,
internal/goexperiment, internal/goos,
internal/goversion, internal/nettrace,
internal/goversion, internal/nettrace, internal/platform,
unicode/utf8, unicode/utf16, unicode,
unsafe;
@ -529,7 +529,7 @@ var depsRules = `
internal/fuzz, internal/testlog, runtime/pprof, regexp
< testing/internal/testdeps;
OS, flag, testing, internal/cfg
OS, flag, testing, internal/cfg, internal/platform
< internal/testenv;
OS, encoding/base64

2
src/internal/fuzz/counters_unsupported.go
View File

@ -6,7 +6,7 @@
// the instrumentation is OS specific, but only amd64 and arm64 are
// supported in the runtime. See src/runtime/libfuzzer*.
//
// If you update this constraint, also update cmd/internal/sys.FuzzInstrumeted.
// If you update this constraint, also update internal/platform.FuzzInstrumeted.
//
//go:build !((darwin || linux || windows || freebsd) && (amd64 || arm64))

2
src/internal/fuzz/sys_unimplemented.go
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// If you update this constraint, also update cmd/internal/sys.FuzzSupported.
// If you update this constraint, also update internal/platform.FuzzSupported.
//
//go:build !darwin && !freebsd && !linux && !windows

3
src/cmd/internal/sys/supported.go → src/internal/platform/supported.go
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package sys
package platform
// RaceDetectorSupported reports whether goos/goarch supports the race
// detector. There is a copy of this function in cmd/dist/test.go.
@ -70,7 +70,6 @@ func FuzzInstrumented(goos, goarch string) bool {
}
// MustLinkExternal reports whether goos/goarch requires external linking.
// (This is the opposite of internal/testenv.CanInternalLink. Keep them in sync.)
func MustLinkExternal(goos, goarch string) bool {
switch goos {
case "android":

14
src/internal/testenv/testenv.go
View File

@ -16,6 +16,7 @@ import (
"flag"
"fmt"
"internal/cfg"
"internal/platform"
"os"
"os/exec"
"path/filepath"
@ -295,19 +296,8 @@ func MustHaveCGO(t testing.TB) {
// CanInternalLink reports whether the current system can link programs with
// internal linking.
// (This is the opposite of cmd/internal/sys.MustLinkExternal. Keep them in sync.)
func CanInternalLink() bool {
switch runtime.GOOS {
case "android":
if runtime.GOARCH != "arm64" {
return false
}
case "ios":
if runtime.GOARCH == "arm64" {
return false
}
}
return true
return !platform.MustLinkExternal(runtime.GOOS, runtime.GOARCH)
}
// MustInternalLink checks that the current system can link programs with internal