internal/buildcfg: refactor GOEXPERIMENT parsing code somewhat

This CL extracts out a ParseGOEXPERIMENT helper function that parses
GOOS/GOARCH/GOEXPERIMENT values and returns active and baseline
experiment flag sets and an error value, without affecting any global
state. This will be used in the subsequent CL for 'go env' support for
GOEXPERIMENT to validate configuration changes.

The existing package initialization for Experiment and
experimentBaseline and also UpdateExperiments are updated to use it as
well.

Change-Id: Ic2ed3fd36d2a6f7f3d8172fccb865e02505c0052
Reviewed-on: https://go-review.googlesource.com/c/go/+/331109
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Matthew Dempsky <mdempsky@google.com>

diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
index fc6989097ee94268760b7ca78eab610606eac219..57a3c1ff6fbdc1f9f29a10a4580e8d40e4f8c908 100644 (file)
--- a/src/cmd/go/internal/cfg/cfg.go
+++ b/src/cmd/go/internal/cfg/cfg.go
@@ -79,7 +79,7 @@ func defaultContext() build.Context {
 
        // The experiments flags are based on GOARCH, so they may
        // need to change.  TODO: This should be cleaned up.
-       buildcfg.UpdateExperiments(ctxt.GOARCH)
+       buildcfg.UpdateExperiments(ctxt.GOOS, ctxt.GOARCH, envOr("GOEXPERIMENT", buildcfg.DefaultGOEXPERIMENT))
        ctxt.ToolTags = nil
        for _, exp := range buildcfg.EnabledExperiments() {
                ctxt.ToolTags = append(ctxt.ToolTags, "goexperiment."+exp)

diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
index 640aa1934db55ae1f136a90de153fc598da50be2..9a60253aab9b1830815bf4b69ffd3fee32474974 100644 (file)
--- a/src/internal/buildcfg/exp.go
+++ b/src/internal/buildcfg/exp.go
@@ -6,7 +6,6 @@ package buildcfg
 
 import (
        "fmt"
-       "os"
        "reflect"
        "strings"
 
@@ -18,20 +17,19 @@ import (
 //
 // (This is not necessarily the set of experiments the compiler itself
 // was built with.)
-var Experiment goexperiment.Flags = parseExperiments(GOARCH)
-
-var regabiSupported = GOARCH == "amd64" && (GOOS == "android" || GOOS == "linux" || GOOS == "darwin" || GOOS == "windows")
-
+//
 // experimentBaseline specifies the experiment flags that are enabled by
 // default in the current toolchain. This is, in effect, the "control"
 // configuration and any variation from this is an experiment.
-var experimentBaseline = goexperiment.Flags{
-       RegabiWrappers: regabiSupported,
-       RegabiG:        regabiSupported,
-       RegabiReflect:  regabiSupported,
-       RegabiDefer:    regabiSupported,
-       RegabiArgs:     regabiSupported,
-}
+var Experiment, experimentBaseline = func() (goexperiment.Flags, goexperiment.Flags) {
+       flags, baseline, err := ParseGOEXPERIMENT(GOOS, GOARCH, envOr("GOEXPERIMENT", defaultGOEXPERIMENT))
+       if err != nil {
+               Error = err
+       }
+       return flags, baseline
+}()
+
+const DefaultGOEXPERIMENT = defaultGOEXPERIMENT
 
 // FramePointerEnabled enables the use of platform conventions for
 // saving frame pointers.
@@ -42,16 +40,29 @@ var experimentBaseline = goexperiment.Flags{
 // Note: must agree with runtime.framepointer_enabled.
 var FramePointerEnabled = GOARCH == "amd64" || GOARCH == "arm64"
 
-func parseExperiments(goarch string) goexperiment.Flags {
+// ParseGOEXPERIMENT parses a (GOOS, GOARCH, GOEXPERIMENT)
+// configuration tuple and returns the enabled and baseline experiment
+// flag sets.
+//
+// TODO(mdempsky): Move to internal/goexperiment.
+func ParseGOEXPERIMENT(goos, goarch, goexp string) (flags, baseline goexperiment.Flags, err error) {
+       regabiSupported := goarch == "amd64" && (goos == "android" || goos == "linux" || goos == "darwin" || goos == "windows")
+
+       baseline = goexperiment.Flags{
+               RegabiWrappers: regabiSupported,
+               RegabiG:        regabiSupported,
+               RegabiReflect:  regabiSupported,
+               RegabiDefer:    regabiSupported,
+               RegabiArgs:     regabiSupported,
+       }
+
        // Start with the statically enabled set of experiments.
-       flags := experimentBaseline
+       flags = baseline
 
        // Pick up any changes to the baseline configuration from the
        // GOEXPERIMENT environment. This can be set at make.bash time
        // and overridden at build time.
-       env := envOr("GOEXPERIMENT", defaultGOEXPERIMENT)
-
-       if env != "" {
+       if goexp != "" {
                // Create a map of known experiment names.
                names := make(map[string]func(bool))
                rv := reflect.ValueOf(&flags).Elem()
@@ -74,7 +85,7 @@ func parseExperiments(goarch string) goexperiment.Flags {
                }
 
                // Parse names.
-               for _, f := range strings.Split(env, ",") {
+               for _, f := range strings.Split(goexp, ",") {
                        if f == "" {
                                continue
                        }
@@ -91,8 +102,8 @@ func parseExperiments(goarch string) goexperiment.Flags {
                        }
                        set, ok := names[f]
                        if !ok {
-                               fmt.Printf("unknown experiment %s\n", f)
-                               os.Exit(2)
+                               err = fmt.Errorf("unknown GOEXPERIMENT %s", f)
+                               return
                        }
                        set(val)
                }
@@ -108,12 +119,12 @@ func parseExperiments(goarch string) goexperiment.Flags {
        }
        // Check regabi dependencies.
        if flags.RegabiG && !flags.RegabiWrappers {
-               Error = fmt.Errorf("GOEXPERIMENT regabig requires regabiwrappers")
+               err = fmt.Errorf("GOEXPERIMENT regabig requires regabiwrappers")
        }
        if flags.RegabiArgs && !(flags.RegabiWrappers && flags.RegabiG && flags.RegabiReflect && flags.RegabiDefer) {
-               Error = fmt.Errorf("GOEXPERIMENT regabiargs requires regabiwrappers,regabig,regabireflect,regabidefer")
+               err = fmt.Errorf("GOEXPERIMENT regabiargs requires regabiwrappers,regabig,regabireflect,regabidefer")
        }
-       return flags
+       return
 }
 
 // expList returns the list of lower-cased experiment names for
@@ -169,6 +180,10 @@ func AllExperiments() []string {
 // UpdateExperiments updates the Experiment global based on a new GOARCH value.
 // This is only required for cmd/go, which can change GOARCH after
 // program startup due to use of "go env -w".
-func UpdateExperiments(goarch string) {
-       Experiment = parseExperiments(goarch)
+func UpdateExperiments(goos, goarch, goexperiment string) {
+       var err error
+       Experiment, experimentBaseline, err = ParseGOEXPERIMENT(goos, goarch, goexperiment)
+       if err != nil {
+               Error = err
+       }
 }