]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile: reject large argument areas
authorKeith Randall <khr@google.com>
Tue, 29 May 2018 16:30:12 +0000 (09:30 -0700)
committerKeith Randall <khr@golang.org>
Tue, 29 May 2018 16:58:05 +0000 (16:58 +0000)
Extend stack frame limit of 1GB to include large argument/return areas.
Argument/return areas are part of the parent frame, not the frame itself,
so they need to be handled separately.

Fixes #25507.

Change-Id: I309298a58faee3e7c1dac80bd2f1166c82460087
Reviewed-on: https://go-review.googlesource.com/115036
Run-TryBot: Keith Randall <khr@golang.org>
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/cmd/compile/internal/gc/pgen.go
src/go/types/stdlib_test.go
test/fixedbugs/issue25507.go [new file with mode: 0644]

index 9747a0299e67274f387ef2d929da66b6e2dd6c35..8f3947b0a686af8872b154a33ddbe6fed8f42679 100644 (file)
@@ -257,7 +257,8 @@ const maxStackSize = 1 << 30
 // worker indicates which of the backend workers is doing the processing.
 func compileSSA(fn *Node, worker int) {
        f := buildssa(fn, worker)
-       if f.Frontend().(*ssafn).stksize >= maxStackSize {
+       // Note: check arg size to fix issue 25507.
+       if f.Frontend().(*ssafn).stksize >= maxStackSize || fn.Type.ArgWidth() >= maxStackSize {
                largeStackFramesMu.Lock()
                largeStackFrames = append(largeStackFrames, fn.Pos)
                largeStackFramesMu.Unlock()
index ad4c51f74def16e3a870dfb7972c29e45a9de2d9..dd1510d37e36979e0617479494be65a3f8b8da37 100644 (file)
@@ -174,6 +174,7 @@ func TestStdFixed(t *testing.T) {
                "issue20529.go",  // go/types does not have constraints on stack size
                "issue22200.go",  // go/types does not have constraints on stack size
                "issue22200b.go", // go/types does not have constraints on stack size
+               "issue25507.go",  // go/types does not have constraints on stack size
        )
 }
 
diff --git a/test/fixedbugs/issue25507.go b/test/fixedbugs/issue25507.go
new file mode 100644 (file)
index 0000000..8dcbae1
--- /dev/null
@@ -0,0 +1,29 @@
+// errorcheck
+
+// Copyright 2018 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.
+
+// We have a limit of 1GB for stack frames.
+// Test that we extend that limit to include large argument/return areas.
+// Argument/return areas are part of the parent frame, not the frame itself,
+// so they need to be handled separately.
+
+package main
+
+// >1GB to trigger failure, <2GB to work on 32-bit platforms.
+type large struct {
+       b [1500000000]byte
+}
+
+func (x large) f1() int { // ERROR "stack frame too large"
+       return 5
+}
+
+func f2(x large) int { // ERROR "stack frame too large"
+       return 5
+}
+
+func f3() (x large, i int) { // ERROR "stack frame too large"
+       return
+}