diff --git a/internal/cgen/func.go b/internal/cgen/func.go index 9a25cf06..302f5601 100644 --- a/internal/cgen/func.go +++ b/internal/cgen/func.go @@ -423,13 +423,26 @@ func (g *gen) writeFuncImplBodySuspend(b *buffer) error { } func (g *gen) writeFuncImplEpilogue(b *buffer) error { + epilogue := "" if g.currFunk.astFunc.Effect().Coroutine() || (g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) { b.writes("goto exit;exit:") // The goto avoids the "unused label" warning. + + if g.currFunk.astFunc.Public() { + epilogue = "if (wuffs_base__status__is_error(&status)) { " + + "self->private_impl.magic = WUFFS_BASE__DISABLED; }\n" + + "return status;\n" + } else { + epilogue = "return status;\n" + } + } else if g.currFunk.astFunc.Out() == nil { + epilogue = "return wuffs_base__make_empty_struct();\n" } - if g.currFunk.derivedVars != nil { + if (epilogue == "") && g.currFunk.astFunc.BodyEndsWithReturn() { + // No-op. + } else if g.currFunk.derivedVars != nil { for _, o := range g.currFunk.astFunc.In().Fields() { o := o.AsField() if err := g.writeSaveDerivedVar(b, "", aPrefix, o.Name(), o.XType()); err != nil { @@ -439,17 +452,7 @@ func (g *gen) writeFuncImplEpilogue(b *buffer) error { b.writes("\n") } - if g.currFunk.astFunc.Effect().Coroutine() || - (g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) { - - if g.currFunk.astFunc.Public() { - b.writes("if (wuffs_base__status__is_error(&status)) { " + - "self->private_impl.magic = WUFFS_BASE__DISABLED; }\n") - } - b.writes("return status;\n") - } else if g.currFunk.astFunc.Out() == nil { - b.writes("return wuffs_base__make_empty_struct();\n") - } + b.writes(epilogue) return nil } diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 2f356d18..602ff14b 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -834,6 +834,14 @@ func (n *Func) Out() *TypeExpr { return n.rhs.AsTypeExpr() } func (n *Func) Asserts() []*Node { return n.list1 } func (n *Func) Body() []*Node { return n.list2 } +func (n *Func) BodyEndsWithReturn() bool { + if len(n.list2) == 0 { + return false + } + end := n.list2[len(n.list2)-1] + return (end.kind == KRet) && (end.AsRet().Keyword() == t.IDReturn) +} + func NewFunc(flags Flags, filename string, line uint32, receiverName t.ID, funcName t.ID, in *Struct, out *TypeExpr, asserts []*Node, body []*Node) *Func { return &Func{ kind: KFunc, diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 64ae25e8..55ece628 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -18699,9 +18699,6 @@ label_0_break:; a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } return 1; - if (a_src) { - a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); - } } #endif // !defined(WUFFS_CONFIG__MODULES) ||