diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 96e854ae..987cbbb8 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -300,7 +300,7 @@ func (g *gen) writeFuncImplFooter(b *buffer) error { for _, o := range g.currFunk.astFunc.In().Fields() { o := o.Field() - if err := g.writeSaveDerivedVar(b, "", o.Name(), o.XType(), true); err != nil { + if err := g.writeSaveDerivedVar(b, "", o.Name(), o.XType()); err != nil { return err } } diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index c2e1cf06..fec60708 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -110,6 +110,8 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type b.printf("uint8_t* ioptr_%s = NULL;", nameStr) b.printf("uint8_t* iobounds0orig_%s = NULL;", nameStr) b.printf("uint8_t* iobounds1_%s = NULL;", nameStr) + b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_%s);", nameStr) + b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_%s);", nameStr) } b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr) @@ -138,7 +140,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type return nil } -func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.TypeExpr, footer bool) error { +func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.TypeExpr) error { // TODO: remove this hack. We're picking up the wrong name for "src:r, // dummy:in.src". if name.Str(g.tm) == "dummy" { @@ -166,17 +168,9 @@ func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type } b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr) - b.printf("%s%s.private_impl.buf->%s = ioptr_%s - %s%s.private_impl.buf->ptr;", aPrefix, nameStr, i0, nameStr, aPrefix, nameStr) - - if footer { - b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_%s);", nameStr) - b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_%s);", nameStr) - } - b.printf("}\n") - return nil } @@ -219,7 +213,7 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error { } else if s == "w" { hack = "w" } - if err := g.writeSaveDerivedVar(b, hack, o.Name(), o.Value().MType(), false); err != nil { + if err := g.writeSaveDerivedVar(b, hack, o.Name(), o.Value().MType()); err != nil { return err } } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index b778d886..993fce4a 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1837,6 +1837,8 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -1942,8 +1944,6 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } self->private_impl.status = status; @@ -1964,6 +1964,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2090,8 +2092,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2119,6 +2119,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -2135,6 +2137,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2232,13 +2236,9 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2340,6 +2340,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2562,8 +2564,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2883,6 +2883,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -2899,6 +2901,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -3200,13 +3204,9 @@ label_0_break:; exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -3237,6 +3237,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -3253,6 +3255,8 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -3616,13 +3620,9 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 8e0d2b6e..84b882ee 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1838,6 +1838,8 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -1929,8 +1931,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } self->private_impl.status = status; @@ -1965,6 +1965,8 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2054,8 +2056,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } self->private_impl.status = status; @@ -2083,6 +2083,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2139,8 +2141,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2168,6 +2168,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2257,8 +2259,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2284,6 +2284,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2355,8 +2357,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2382,6 +2382,8 @@ static wuffs_gif__status wuffs_gif__decoder__skip_blocks( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2443,8 +2445,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2473,6 +2473,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2657,8 +2659,6 @@ suspend: exit: if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -2699,6 +2699,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -2715,6 +2717,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -3036,13 +3040,9 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; @@ -3089,6 +3089,8 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -3105,6 +3107,8 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -3260,13 +3264,9 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } return status; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 7d6721fd..f24bef56 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1981,6 +1981,8 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -1997,6 +1999,8 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2284,13 +2288,9 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } self->private_impl.status = status; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 8787b4ee..5931a5fa 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1977,6 +1977,8 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; uint8_t* iobounds1_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); if (a_dst.private_impl.buf) { ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; if (!a_dst.private_impl.bounds[0]) { @@ -1993,6 +1995,8 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); if (a_src.private_impl.buf) { ioptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; if (!a_src.private_impl.bounds[0]) { @@ -2146,13 +2150,9 @@ suspend: exit: if (a_dst.private_impl.buf) { a_dst.private_impl.buf->wi = ioptr_dst - a_dst.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_dst); } if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_src); } self->private_impl.status = status;