diff options
author | Cherry Mui <cherryyz@google.com> | 2023-03-31 18:29:10 +0000 |
---|---|---|
committer | Cherry Mui <cherryyz@google.com> | 2023-03-31 18:42:48 +0000 |
commit | 63ef9059a2e920d22522f9be068df357fab3d1f6 (patch) | |
tree | 1affff0606132b2c244304e2665895dd1d18e4e2 /misc | |
parent | 092d43c329babb41f9bbad265bfe82bb48522b64 (diff) | |
download | go-63ef9059a2e920d22522f9be068df357fab3d1f6.tar.gz go-63ef9059a2e920d22522f9be068df357fab3d1f6.zip |
Revert "runtime: get a better g0 stack bound in needm"
This reverts CL 479915.
Reason for revert: breaks a lot google internal tests.
Change-Id: I13a9422e810af7ba58cbf4a7e6e55f4d8cc0ca51
Reviewed-on: https://go-review.googlesource.com/c/go/+/481055
Reviewed-by: Chressie Himpel <chressie@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'misc')
-rw-r--r-- | misc/cgo/testcarchive/carchive_test.go | 54 | ||||
-rw-r--r-- | misc/cgo/testcarchive/testdata/libgo9/a.go | 14 | ||||
-rw-r--r-- | misc/cgo/testcarchive/testdata/main9.c | 24 |
3 files changed, 0 insertions, 92 deletions
diff --git a/misc/cgo/testcarchive/carchive_test.go b/misc/cgo/testcarchive/carchive_test.go index 5996268018..8a39c24a6d 100644 --- a/misc/cgo/testcarchive/carchive_test.go +++ b/misc/cgo/testcarchive/carchive_test.go @@ -1247,57 +1247,3 @@ func TestPreemption(t *testing.T) { t.Error(err) } } - -// Issue 59294. Test calling Go function from C after using some -// stack space. -func TestDeepStack(t *testing.T) { - t.Parallel() - - if !testWork { - defer func() { - os.Remove("testp9" + exeSuffix) - os.Remove("libgo9.a") - os.Remove("libgo9.h") - }() - } - - cmd := exec.Command("go", "build", "-buildmode=c-archive", "-o", "libgo9.a", "./libgo9") - out, err := cmd.CombinedOutput() - t.Logf("%v\n%s", cmd.Args, out) - if err != nil { - t.Fatal(err) - } - checkLineComments(t, "libgo9.h") - checkArchive(t, "libgo9.a") - - // build with -O0 so the C compiler won't optimize out the large stack frame - ccArgs := append(cc, "-O0", "-o", "testp9"+exeSuffix, "main9.c", "libgo9.a") - out, err = exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput() - t.Logf("%v\n%s", ccArgs, out) - if err != nil { - t.Fatal(err) - } - - argv := cmdToRun("./testp9") - cmd = exec.Command(argv[0], argv[1:]...) - sb := new(strings.Builder) - cmd.Stdout = sb - cmd.Stderr = sb - if err := cmd.Start(); err != nil { - t.Fatal(err) - } - - timer := time.AfterFunc(time.Minute, - func() { - t.Error("test program timed out") - cmd.Process.Kill() - }, - ) - defer timer.Stop() - - err = cmd.Wait() - t.Logf("%v\n%s", cmd.Args, sb) - if err != nil { - t.Error(err) - } -} diff --git a/misc/cgo/testcarchive/testdata/libgo9/a.go b/misc/cgo/testcarchive/testdata/libgo9/a.go deleted file mode 100644 index acb08d90ec..0000000000 --- a/misc/cgo/testcarchive/testdata/libgo9/a.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2023 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 main - -import "runtime" - -import "C" - -func main() {} - -//export GoF -func GoF() { runtime.GC() } diff --git a/misc/cgo/testcarchive/testdata/main9.c b/misc/cgo/testcarchive/testdata/main9.c deleted file mode 100644 index 95ad4dea49..0000000000 --- a/misc/cgo/testcarchive/testdata/main9.c +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#include "libgo9.h" - -void use(int *x) { (*x)++; } - -void callGoFWithDeepStack() { - int x[10000]; - - use(&x[0]); - use(&x[9999]); - - GoF(); - - use(&x[0]); - use(&x[9999]); -} - -int main() { - GoF(); // call GoF without using much stack - callGoFWithDeepStack(); // call GoF with a deep stack -} |