TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

compiler: correctly handle defer in functions without return values

Browse source 
Fix #2253.
This commit is contained in:
Roman Khimov 2021-11-12 19:30:50 +03:00
parent b31a8d750e
commit a91581fa16
2 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/compiler/codegen.go
View file

@ -499,6 +499,7 @@ func (c *codegen) convertFuncDecl(file ast.Node, decl *ast.FuncDecl, pkg *types.
// we should clean alt.stack manually.
// This can be the case with void and named-return functions.
if !isInit && !isDeploy && !lastStmtIsReturn(decl.Body) {
c.processDefers()
c.saveSequencePoint(decl.Body)
emit.Opcodes(c.prog.BinWriter, opcode.RET)
}
@ -1329,10 +1330,13 @@ func (c *codegen) processDefers() {
c.emitStoreByIndex(varLocal, finalIndex)
ast.Walk(c, stmt.expr)
if i == 0 {
// After panic, default values must be returns, except for named returns,
// which we don't support here for now.
for i := len(c.scope.decl.Type.Results.List) - 1; i >= 0; i-- {
c.emitDefault(c.typeOf(c.scope.decl.Type.Results.List[i].Type))
results := c.scope.decl.Type.Results
if results.NumFields() != 0 {
// After panic, default values must be returns, except for named returns,
// which we don't support here for now.
for i := len(results.List) - 1; i >= 0; i-- {
c.emitDefault(c.typeOf(results.List[i].Type))
}
}
}
emit.Jmp(c.prog.BinWriter, opcode.ENDTRYL, after)