cmd/dist: force stackGuardMultiplierDefault to 1

Nothing seems to break, not even the noopt builder.

For #51256 (the conversation there is headed toward additional changes).

Change-Id: Icb7ca451159a74f351c25d2cefb32c773b9bb017
Reviewed-on: https://go-review.googlesource.com/c/go/+/416859
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/cmd/dist/buildruntime.go b/src/cmd/dist/buildruntime.go
index e66a9f009f8604627279df3dde86c7051d990bbc..6d88046566407c3fc420555513ba40c1289eae69 100644 (file)
--- a/src/cmd/dist/buildruntime.go
+++ b/src/cmd/dist/buildruntime.go
@@ -7,8 +7,6 @@ package main
 import (
        "bytes"
        "fmt"
-       "os"
-       "strings"
 )
 
 /*
@@ -19,15 +17,12 @@ import (
 //
 //     package sys
 //
-//     const StackGuardMultiplier = <multiplier value>
+// (Nothing right now!)
 func mkzversion(dir, file string) {
        var buf bytes.Buffer
        fmt.Fprintf(&buf, "// Code generated by go tool dist; DO NOT EDIT.\n")
        fmt.Fprintln(&buf)
        fmt.Fprintf(&buf, "package sys\n")
-       fmt.Fprintln(&buf)
-       fmt.Fprintf(&buf, "const StackGuardMultiplierDefault = %d\n", stackGuardMultiplierDefault())
-
        writefile(buf.String(), file, writeSkipSame)
 }
 
@@ -78,26 +73,12 @@ func mkbuildcfg(file string) {
 //
 //     package objabi
 //
-//     const stackGuardMultiplierDefault = <multiplier value>
+// (Nothing right now!)
 func mkobjabi(file string) {
        var buf bytes.Buffer
        fmt.Fprintf(&buf, "// Code generated by go tool dist; DO NOT EDIT.\n")
        fmt.Fprintln(&buf)
        fmt.Fprintf(&buf, "package objabi\n")
-       fmt.Fprintln(&buf)
-       fmt.Fprintf(&buf, "const stackGuardMultiplierDefault = %d\n", stackGuardMultiplierDefault())
 
        writefile(buf.String(), file, writeSkipSame)
 }
-
-// stackGuardMultiplierDefault returns a multiplier to apply to the default
-// stack guard size. Larger multipliers are used for non-optimized
-// builds that have larger stack frames.
-func stackGuardMultiplierDefault() int {
-       for _, s := range strings.Split(os.Getenv("GO_GCFLAGS"), " ") {
-               if s == "-N" {
-                       return 2
-               }
-       }
-       return 1
-}

diff --git a/src/cmd/internal/objabi/stack.go b/src/cmd/internal/objabi/stack.go
index 0c82a7c6dd10e76285325776d3c0abdc2f6249b1..80bd1c079934a29dc6febe6924e0e4d21f868ed6 100644 (file)
--- a/src/cmd/internal/objabi/stack.go
+++ b/src/cmd/internal/objabi/stack.go
@@ -27,5 +27,5 @@ func stackGuardMultiplier() int {
        if buildcfg.GOOS == "aix" {
                return 2
        }
-       return stackGuardMultiplierDefault
+       return 1
 }

diff --git a/src/runtime/internal/sys/consts.go b/src/runtime/internal/sys/consts.go
index fffcf81d1f3b398d657ef9a7a1ff9fc1d764a23c..c60371658013566cedbe60a37675cd977b4dd624 100644 (file)
--- a/src/runtime/internal/sys/consts.go
+++ b/src/runtime/internal/sys/consts.go
@@ -10,7 +10,7 @@ import (
 )
 
 // AIX requires a larger stack for syscalls.
-const StackGuardMultiplier = StackGuardMultiplierDefault*(1-goos.IsAix) + 2*goos.IsAix
+const StackGuardMultiplier = 1*(1-goos.IsAix) + 2*goos.IsAix
 
 // DefaultPhysPageSize is the default physical page size.
 const DefaultPhysPageSize = goarch.DefaultPhysPageSize