languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-15 22:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dev.ssa] cmd/compile/internal/ssa: eval defer args before setting argsize and func

Browse source 
Evaluating args can overwrite arg area, so we can't write argsize and func
until args are evaluated.

Fixes test/recover.go, test/recover1.go, and test/fixedbugs/issue4066.go

Change-Id: I862e4934ccdb8661431bcc3e1e93817ea834ea3f
Reviewed-on: https://go-review.googlesource.com/14405
Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
Keith Randall 2015-09-08 21:37:37 -07:00
parent a7cfc759f2
commit fd8c71be86
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/compile/internal/gc/ssa.go
View file

@ -741,6 +741,10 @@ func (s *state) stmt(n *Node) {
s.Unimplementedf("defer/go of %s", opnames[call.Op])
}
// Run all argument assignments. The arg slots have already
// been offset by 2*widthptr.
s.stmtList(call.List)
// Write argsize and closure (args to Newproc/Deferproc)
argsize := s.constInt32(Types[TUINT32], int32(fn.Type.Argwid))
s.vars[&memvar] = s.newValue3I(ssa.OpStore, ssa.TypeMem, 4, s.sp, argsize, s.mem())
@ -748,10 +752,6 @@ func (s *state) stmt(n *Node) {
addr := s.entryNewValue1I(ssa.OpOffPtr, Ptrto(Types[TUINTPTR]), int64(Widthptr), s.sp)
s.vars[&memvar] = s.newValue3I(ssa.OpStore, ssa.TypeMem, int64(Widthptr), addr, closure, s.mem())
// Run all argument assignments. The arg slots have already
// been offset by 2*widthptr.
s.stmtList(call.List)
// Call deferproc or newproc
bNext := s.f.NewBlock(ssa.BlockPlain)
var op ssa.Op

4
test/run.go
View file

@ -638,8 +638,8 @@ func (t *test) run() {
case "run":
useTmp = false
switch t.gofile {
case "bug434.go", "recover.go", "recover1.go", "issue4066.go":
// TODO fix these failures
case "bug434.go":
// TODO fix this failure
default:
ssaMain = true
}