mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
[dev.typeparams] all: merge master (912f075) into dev.typeparams
Conflicts: - src/cmd/compile/internal/escape/escape.go On master, CL 332230 changed the ">=" in HeapAllocReason to ">"; but on dev.typeparams, CL 329989 moved HeapAllocReason into utils.go. Merge List: + 2021-07-02912f075047net/http: mention socks5 support in proxy + 2021-07-02287c5e8066cmd/compile: fix stack growing algorithm + 2021-07-02743f03eeb0spec, unsafe: clarify unsafe.Slice docs + 2021-07-026125d0c426cmd/dist: correct comment: SysProcAttri -> SysProcAttr + 2021-07-0103761ede02net: don't reject null mx records + 2021-07-01877688c838testing: add TB.Setenv + 2021-07-01ef8ae82b37cmd/compile: fix bug in dwarf-gen var location generation + 2021-07-01770899f7e1cmd/go: add a regression test for 'go mod vendor' path traversal + 2021-07-01835d86a17ecmd/go: use path.Dir instead of filepath.Dir for package paths in 'go mod vendor' + 2021-07-01eb437ba92ccmd/compile: make stack value size threshold comparisons consistent + 2021-07-019d65578b83cmd/compile: fix typos in document Change-Id: I08aa852441af0f070aa32dd2f99b6fa4e9d79cfa
This commit is contained in:
commit
f35d86fd5f
15 changed files with 111 additions and 21 deletions
|
|
@ -1061,7 +1061,9 @@ func newstack() {
|
|||
// recheck the bounds on return.)
|
||||
if f := findfunc(gp.sched.pc); f.valid() {
|
||||
max := uintptr(funcMaxSPDelta(f))
|
||||
for newsize-gp.sched.sp < max+_StackGuard {
|
||||
needed := max + _StackGuard
|
||||
used := gp.stack.hi - gp.sched.sp
|
||||
for newsize-used < needed {
|
||||
newsize *= 2
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue