qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 22:20:03 -07:00
Code Releases Activity

Fix segfault on unnamed function arguments. Make continue

Browse Source 
jump to the post statement instead of the condition check.

R=rsc
APPROVED=rsc
DELTA=10  (6 added, 1 deleted, 3 changed)
OCL=32359
CL=32379
This commit is contained in:
Austin Clements 2009-07-28 16:38:41 -07:00
parent d27bae5033
commit f62585118c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr/austin/eval/stmt.go
View File

@ -588,7 +588,7 @@ func (a *stmtCompiler) DoForStmt(s *ast.ForStmt) {
bc.compileStmt(s.Init); bc.compileStmt(s.Init);
} }
var bodyPC, checkPC, endPC uint; var bodyPC, postPC, checkPC, endPC uint;
// Jump to condition check. We generate slightly less code by // Jump to condition check. We generate slightly less code by
// placing the condition check after the body. // placing the condition check after the body.
@ -598,11 +598,12 @@ func (a *stmtCompiler) DoForStmt(s *ast.ForStmt) {
bodyPC = a.nextPC(); bodyPC = a.nextPC();
body := bc.enterChild(); body := bc.enterChild();
body.breakPC = &endPC; body.breakPC = &endPC;
body.continuePC = &checkPC; body.continuePC = &postPC;
body.compileStmts(s.Body); body.compileStmts(s.Body);
body.exit(); body.exit();
// Compile post, if any // Compile post, if any
postPC = a.nextPC();
if s.Post != nil { if s.Post != nil {
// TODO(austin) Does the parser disallow short // TODO(austin) Does the parser disallow short
// declarations in s.Post? // declarations in s.Post?
@ -711,13 +712,17 @@ func (a *compiler) compileFunc(scope *Scope, decl *FuncDecl, body *ast.BlockStmt
// corresponding function. // corresponding function.
bodyScope := scope.Fork(); bodyScope := scope.Fork();
for i, t := range decl.Type.In { for i, t := range decl.Type.In {
bodyScope.DefineVar(decl.InNames[i].Value, t); if decl.InNames[i] != nil {
bodyScope.DefineVar(decl.InNames[i].Value, t);
} else {
// TODO(austin) Not technically a temp
bodyScope.DefineTemp(t);
}
} }
for i, t := range decl.Type.Out { for i, t := range decl.Type.Out {
if decl.OutNames[i] != nil { if decl.OutNames[i] != nil {
bodyScope.DefineVar(decl.OutNames[i].Value, t); bodyScope.DefineVar(decl.OutNames[i].Value, t);
} else { } else {
// TODO(austin) Not technically a temp
bodyScope.DefineTemp(t); bodyScope.DefineTemp(t);
} }
} }