diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 21187cbe..ba5c77ec 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -428,7 +428,7 @@ func (g *gen) writeSuspendibles(b *buffer, n *a.Expr, depth uint32) error { return err } mightActuallySuspend := err != nil - if mightActuallySuspend { + if mightActuallySuspend && n.Operator() != t.IDTry { if err := g.writeCoroSuspPoint(b, false); err != nil { return err } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index f3d860ed..9509661d 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1904,7 +1904,6 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( while (true) { wuffs_base__io_writer__mark(&a_dst, b_wptr_dst); { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); if (a_dst.private_impl.buf) { size_t n = b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); @@ -1969,7 +1968,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( } } status = v_z; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); } goto ok; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 804c0fff..3fe22dbc 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -3152,7 +3152,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( : 0); v_r = a_src; { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); if (a_src.private_impl.buf) { size_t n = b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); @@ -3191,7 +3190,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( goto label_1_break; } status = v_z; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(16); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(15); } label_1_break:; } diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index a15239bd..15e2e415 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -2213,7 +2213,6 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, while (true) { wuffs_base__io_writer__mark(&a_dst, b_wptr_dst); { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); if (a_dst.private_impl.buf) { size_t n = b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); @@ -2265,18 +2264,18 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, goto label_2_break; } status = v_z; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(16); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(15); } label_2_break:; { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(17); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); uint32_t t_10; if (WUFFS_BASE__LIKELY(b_rend_src - b_rptr_src >= 4)) { t_10 = wuffs_base__load_u32le(b_rptr_src); b_rptr_src += 4; } else { self->private_impl.c_decode[0].scratch = 0; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(18); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(17); while (true) { if (WUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; @@ -2297,14 +2296,14 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, v_checksum_want = t_10; } { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(19); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(18); uint32_t t_12; if (WUFFS_BASE__LIKELY(b_rend_src - b_rptr_src >= 4)) { t_12 = wuffs_base__load_u32le(b_rptr_src); b_rptr_src += 4; } else { self->private_impl.c_decode[0].scratch = 0; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(20); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(19); while (true) { if (WUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 144b0263..2de3c4ae 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -2116,7 +2116,6 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, while (true) { wuffs_base__io_writer__mark(&a_dst, b_wptr_dst); { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_dst.private_impl.buf) { size_t n = b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); @@ -2161,18 +2160,18 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, goto label_0_break; } status = v_z; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); } label_0_break:; { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); uint32_t t_4; if (WUFFS_BASE__LIKELY(b_rend_src - b_rptr_src >= 4)) { t_4 = wuffs_base__load_u32be(b_rptr_src); b_rptr_src += 4; } else { self->private_impl.c_decode[0].scratch = 0; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); while (true) { if (WUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src;