mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/gc, cmd/6g: fix error on large stacks. 

Fixes #4666.

R=golang-dev, daniel.morsing, rsc
CC=golang-dev
https://golang.org/cl/7141047
This commit is contained in:
Rémy Oudompheng 2013-01-18 22:36:43 +01:00
parent 41ec481a53
commit d127ed5378
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/6g/cgen.c
View File

@ -1329,7 +1329,7 @@ void
sgen(Node *n, Node *ns, int64 w)
{
Node nodl, nodr, nodsi, noddi, cx, oldcx, tmp;
int32 c, q, odst, osrc;
vlong c, q, odst, osrc;
if(debug['g']) {
print("\nsgen w=%lld\n", w);

6
src/cmd/gc/go.h
View File

@ -320,7 +320,7 @@ struct Node
int32 lineno;
int32 endlineno;
vlong xoffset;
int32 stkdelta; // offset added by stack frame compaction phase.
vlong stkdelta; // offset added by stack frame compaction phase.
int32 ostk;
int32 iota;
uint32 walkgen;
@ -912,8 +912,8 @@ EXTERN int loophack;
EXTERN int32 iota;
EXTERN NodeList* lastconst;
EXTERN Node* lasttype;
EXTERN int32 maxarg;
EXTERN int32 stksize; // stack size for current frame
EXTERN vlong maxarg;
EXTERN vlong stksize; // stack size for current frame
EXTERN int32 blockgen; // max block number
EXTERN int32 block; // current block number
EXTERN int hasdefer; // flag that curfn has defer statetment

8
test/fixedbugs/bug385_64.go
View File

@ -8,11 +8,17 @@
// license that can be found in the LICENSE file.
// Issue 2444
// Issue 4666: issue with arrays of exactly 4GB.
package main
func main() { // ERROR "stack frame too large"
func main() { // ERROR "stack frame too large"
var arr [1000200030]int32
arr_bkup := arr
_ = arr_bkup
}
func F() { // ERROR "stack frame too large"
var arr [1 << 30]int32
_ = arr[42]
}

5
test/fixedbugs/issue4348.go
View File

@ -1,4 +1,7 @@
// compile
// skip
// NOTE: this test is now skipped because the relevant code
// is rejected after fixing issue 4666.
// Copyright 2012 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style