From f37cfcf554e6a65673691026bbab67b0b85184f6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 9 Jul 2024 14:11:31 +1000 Subject: [PATCH] check: drop more facts when calling coroutines --- lang/check/bounds.go | 12 +-- release/c/wuffs-unsupported-snapshot.c | 111 ++++++++++++++----------- std/bmp/decode_bmp.wuffs | 4 +- std/webp/decode_webp.wuffs | 68 +++++++++------ 4 files changed, 116 insertions(+), 79 deletions(-) diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 887b25da..004f07fc 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -463,18 +463,18 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { lTyp = lhs.MType() } + if (rhs.Operator() == a.ExprOperatorCall) && rhs.Effect().Coroutine() && (op != t.IDEqQuestion) { + if err := q.facts.update(updateFactsForSuspension); err != nil { + return err + } + } + nb, err := q.bcheckAssignment1(lhs, lTyp, op, rhs) if err != nil { return err } if (rhs.Operator() == a.ExprOperatorCall) && rhs.Effect().Impure() { - if rhs.Effect().Coroutine() && (op != t.IDEqQuestion) { - if err := q.facts.update(updateFactsForSuspension); err != nil { - return err - } - } - recv := rhs.LHS().AsExpr().LHS().AsExpr() if err := q.facts.update(func(x *a.Expr) (*a.Expr, error) { if _, ok := oldFacts[x]; !ok { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 6bd85a43..d9d0df33 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -30953,6 +30953,7 @@ wuffs_bmp__decoder__do_decode_image_config( uint32_t v_width = 0; uint32_t v_height = 0; uint32_t v_planes = 0; + uint32_t v_n = 0; uint32_t v_dst_pixfmt = 0; uint32_t v_byte_width = 0; @@ -31710,7 +31711,8 @@ wuffs_bmp__decoder__do_decode_image_config( } } } else if (self->private_impl.f_bitmap_info_len >= 40u) { - self->private_data.s_do_decode_image_config.scratch = (self->private_impl.f_bitmap_info_len - 40u); + v_n = (self->private_impl.f_bitmap_info_len - 40u); + self->private_data.s_do_decode_image_config.scratch = v_n; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(45); if (self->private_data.s_do_decode_image_config.scratch > ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_do_decode_image_config.scratch -= ((uint64_t)(io2_a_src - iop_a_src)); @@ -72565,6 +72567,7 @@ wuffs_webp__decoder__decode_transform( wuffs_base__slice_u8 a_workbuf) { wuffs_base__status status = wuffs_base__make_status(NULL); + wuffs_base__status v_status = wuffs_base__make_status(NULL); uint8_t v_c8 = 0; uint32_t v_transform_type = 0; uint32_t v_tile_size_log2 = 0; @@ -72663,28 +72666,34 @@ wuffs_webp__decoder__decode_transform( if (status.repr) { goto suspend; } - if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 1u)])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)])) > ((uint64_t)(a_workbuf.len)))) { - status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); - goto exit; - } - if (a_src) { - a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); - } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - status = wuffs_webp__decoder__decode_pixels(self, - wuffs_base__slice_u8__subslice_ij(a_workbuf, - ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 1u)])), - ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)]))), - a_src, - ((self->private_impl.f_width + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), - ((self->private_impl.f_height + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), - wuffs_base__utility__empty_slice_u8(), - 0u); - if (a_src) { - iop_a_src = a_src->data.ptr + a_src->meta.ri; - } - if (status.repr) { - goto suspend; + while (true) { + if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 1u)])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)])) > ((uint64_t)(a_workbuf.len)))) { + status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); + goto exit; + } + { + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + wuffs_base__status t_2 = wuffs_webp__decoder__decode_pixels(self, + wuffs_base__slice_u8__subslice_ij(a_workbuf, + ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 1u)])), + ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)]))), + a_src, + ((self->private_impl.f_width + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), + ((self->private_impl.f_height + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), + wuffs_base__utility__empty_slice_u8(), + 0u); + v_status = t_2; + if (a_src) { + iop_a_src = a_src->data.ptr + a_src->meta.ri; + } + } + if (wuffs_base__status__is_ok(&v_status)) { + break; + } + status = v_status; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5); } } else if (v_transform_type == 2u) { } else { @@ -72695,8 +72704,8 @@ wuffs_webp__decoder__decode_transform( status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; } - uint8_t t_2 = *iop_a_src++; - v_c8 = t_2; + uint8_t t_3 = *iop_a_src++; + v_c8 = t_3; } if (self->private_impl.f_n_bits >= 8u) { status = wuffs_base__make_status(wuffs_webp__error__internal_error_inconsistent_n_bits); @@ -72781,7 +72790,6 @@ wuffs_webp__decoder__decode_transform( } } - goto ok; ok: self->private_impl.p_decode_transform = 0; goto exit; @@ -72905,6 +72913,7 @@ wuffs_webp__decoder__decode_hg_table( wuffs_base__slice_u8 a_workbuf) { wuffs_base__status status = wuffs_base__make_status(NULL); + wuffs_base__status v_status = wuffs_base__make_status(NULL); uint8_t v_c8 = 0; uint32_t v_use_hg_table = 0; uint32_t v_tile_size_log2 = 0; @@ -73009,28 +73018,34 @@ wuffs_webp__decoder__decode_hg_table( if (status.repr) { goto suspend; } - if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u])) > ((uint64_t)(a_workbuf.len)))) { - status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); - goto exit; - } - if (a_src) { - a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); - } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - status = wuffs_webp__decoder__decode_pixels(self, - wuffs_base__slice_u8__subslice_ij(a_workbuf, - ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])), - ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))), - a_src, - ((a_width + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), - ((self->private_impl.f_height + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), - wuffs_base__utility__empty_slice_u8(), - 0u); - if (a_src) { - iop_a_src = a_src->data.ptr + a_src->meta.ri; - } - if (status.repr) { - goto suspend; + while (true) { + if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u])) > ((uint64_t)(a_workbuf.len)))) { + status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); + goto exit; + } + { + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + wuffs_base__status t_2 = wuffs_webp__decoder__decode_pixels(self, + wuffs_base__slice_u8__subslice_ij(a_workbuf, + ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])), + ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))), + a_src, + ((a_width + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), + ((self->private_impl.f_height + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2), + wuffs_base__utility__empty_slice_u8(), + 0u); + v_status = t_2; + if (a_src) { + iop_a_src = a_src->data.ptr + a_src->meta.ri; + } + } + if (wuffs_base__status__is_ok(&v_status)) { + break; + } + status = v_status; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5); } self->private_impl.f_overall_n_huffman_groups = 1u; if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u])) > ((uint64_t)(a_workbuf.len)))) { diff --git a/std/bmp/decode_bmp.wuffs b/std/bmp/decode_bmp.wuffs index e429aecf..60c06e80 100644 --- a/std/bmp/decode_bmp.wuffs +++ b/std/bmp/decode_bmp.wuffs @@ -103,6 +103,7 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. var width : base.u32 var height : base.u32 var planes : base.u32 + var n : base.u32 var dst_pixfmt : base.u32 var byte_width : base.u32 @@ -275,7 +276,8 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. } } else if this.bitmap_info_len >= 40 { // Skip the rest of the BITMAPINFOHEADER. - args.src.skip_u32?(n: this.bitmap_info_len - 40) + n = this.bitmap_info_len - 40 + args.src.skip_u32?(n: n) } else { return "#unsupported BMP file" } diff --git a/std/webp/decode_webp.wuffs b/std/webp/decode_webp.wuffs index 3f6546e3..fa9d05ec 100644 --- a/std/webp/decode_webp.wuffs +++ b/std/webp/decode_webp.wuffs @@ -466,6 +466,7 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade } pri func decoder.decode_transform?(src: base.io_reader, workbuf: slice base.u8) { + var status : base.status var c8 : base.u8 var transform_type : base.u32[..= 3] var tile_size_log2 : base.u32[..= 9] @@ -510,19 +511,29 @@ pri func decoder.decode_transform?(src: base.io_reader, workbuf: slice base.u8) this.decode_color_cache_parameters?(src: args.src) this.decode_huffman_groups?(src: args.src, n_huffman_groups: 1) - if ((this.workbuf_offset_for_transform[transform_type + 1] as base.u64) > (this.workbuf_offset_for_transform[transform_type + 2] as base.u64)) or - ((this.workbuf_offset_for_transform[transform_type + 2] as base.u64) > args.workbuf.length()) { - return base."#bad workbuf length" + + while true, + inv transform_type < 2, + inv tile_size_log2 >= 2, + { + if ((this.workbuf_offset_for_transform[transform_type + 1] as base.u64) > (this.workbuf_offset_for_transform[transform_type + 2] as base.u64)) or + ((this.workbuf_offset_for_transform[transform_type + 2] as base.u64) > args.workbuf.length()) { + return base."#bad workbuf length" + } + status =? this.decode_pixels?( + dst: args.workbuf[ + (this.workbuf_offset_for_transform[transform_type + 1] as base.u64) .. + (this.workbuf_offset_for_transform[transform_type + 2] as base.u64)], + src: args.src, + width: (this.width + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, + height: (this.height + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, + tile_data: this.util.empty_slice_u8(), + tile_size_log2: 0) + if status.is_ok() { + break + } + yield? status } - this.decode_pixels?( - dst: args.workbuf[ - (this.workbuf_offset_for_transform[transform_type + 1] as base.u64) .. - (this.workbuf_offset_for_transform[transform_type + 2] as base.u64)], - src: args.src, - width: (this.width + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, - height: (this.height + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, - tile_data: this.util.empty_slice_u8(), - tile_size_log2: 0) } else if transform_type == 2 { // Subtract Green transform. // No-op. @@ -620,6 +631,7 @@ pri func decoder.decode_color_cache_parameters?(src: base.io_reader) { } pri func decoder.decode_hg_table?(src: base.io_reader, width: base.u32[..= 0x4000], workbuf: slice base.u8) { + var status : base.status var c8 : base.u8 var use_hg_table : base.u32[..= 1] var tile_size_log2 : base.u32[..= 9] @@ -674,19 +686,27 @@ pri func decoder.decode_hg_table?(src: base.io_reader, width: base.u32[..= 0x400 this.decode_color_cache_parameters?(src: args.src) this.decode_huffman_groups?(src: args.src, n_huffman_groups: 1) - if ((this.workbuf_offset_for_transform[0] as base.u64) > (this.workbuf_offset_for_transform[1] as base.u64)) or - ((this.workbuf_offset_for_transform[1] as base.u64) > args.workbuf.length()) { - return base."#bad workbuf length" + while true, + inv tile_size_log2 >= 2, + { + if ((this.workbuf_offset_for_transform[0] as base.u64) > (this.workbuf_offset_for_transform[1] as base.u64)) or + ((this.workbuf_offset_for_transform[1] as base.u64) > args.workbuf.length()) { + return base."#bad workbuf length" + } + status =? this.decode_pixels?( + dst: args.workbuf[ + (this.workbuf_offset_for_transform[0] as base.u64) .. + (this.workbuf_offset_for_transform[1] as base.u64)], + src: args.src, + width: (args.width + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, + height: (this.height + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, + tile_data: this.util.empty_slice_u8(), + tile_size_log2: 0) + if status.is_ok() { + break + } + yield? status } - this.decode_pixels?( - dst: args.workbuf[ - (this.workbuf_offset_for_transform[0] as base.u64) .. - (this.workbuf_offset_for_transform[1] as base.u64)], - src: args.src, - width: (args.width + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, - height: (this.height + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2, - tile_data: this.util.empty_slice_u8(), - tile_size_log2: 0) this.overall_n_huffman_groups = 1 if ((this.workbuf_offset_for_transform[0] as base.u64) > (this.workbuf_offset_for_transform[1] as base.u64)) or