diff --git a/cmd/puffs-c/internal/cgen/statement.go b/cmd/puffs-c/internal/cgen/statement.go index 18188847..aa3f6830 100644 --- a/cmd/puffs-c/internal/cgen/statement.go +++ b/cmd/puffs-c/internal/cgen/statement.go @@ -507,10 +507,13 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { b.printf("%srptr_src += %s;\n", bPrefix, scratchName) } else if isInDst(g.tm, n, t.KeyWriteU8, 1) { - b.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;", - bPrefix, bPrefix, g.PKGPREFIX) - b.writes("goto suspend;") - b.writes("}\n") + if !n.ProvenNotToSuspend() { + b.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;", + bPrefix, bPrefix, g.PKGPREFIX) + b.writes("goto suspend;") + b.writes("}\n") + } + b.printf("*%swptr_dst++ = ", bPrefix) x := n.Args()[0].Arg().Value() if err := g.writeExpr(b, x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 7b514022..31b2037a 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2081,11 +2081,6 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; if ((v_table_entry >> 31) != 0) { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (b_wptr_dst == b_wend_dst) { - status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - goto suspend; - } *b_wptr_dst++ = ((v_table_entry >> 8) & 255); goto label_0_continue; } else if ((v_table_entry >> 30) != 0) { @@ -2119,11 +2114,6 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; if ((v_table_entry >> 31) != 0) { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (b_wptr_dst == b_wend_dst) { - status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - goto suspend; - } *b_wptr_dst++ = ((v_table_entry >> 8) & 255); goto label_0_continue; } else if ((v_table_entry >> 30) != 0) { @@ -2316,7 +2306,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( label_0_break:; while (v_n_bits >= 8) { v_n_bits -= 8; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); if (b_rptr_src == b_rstart_src) { status = PUFFS_FLATE__ERROR_INVALID_I_O_OPERATION; goto exit; diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 4ecdff39..b473829c 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -245,8 +245,16 @@ func (q *checker) bcheckStatement(n *a.Node) error { return q.bcheckAssignment(n.LHS(), n.Operator(), n.RHS()) case a.KExpr: - _, _, err := q.bcheckExpr(n.Expr(), 0) - return err + n := n.Expr() + if _, _, err := q.bcheckExpr(n, 0); err != nil { + return err + } + if n.Suspendible() { + if err := q.bcheckIOMethods(n, 0); err != nil { + return err + } + } + return nil case a.KIf: return q.bcheckIf(n.If())