diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 74903fe6..17d0e104 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -163,9 +163,9 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args [] if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { return err } - b.printf(", ((uint64_t)(iop_%s%s - %s%s->data.ptr)), %s%s->data.ptr)"+ + b.printf(", ((uint64_t)(iop_%s%s - %s%s)), %s%s)"+ ": wuffs_base__make_slice_u8(NULL, 0))", - prefix, name, prefix, name, prefix, name) + prefix, name, io0Prefix, name, io0Prefix, name) return nil case t.IDSkipFast: @@ -270,7 +270,7 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args [] if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { return err } - b.printf(", ((uint64_t)(iop_a_dst - a_dst->data.ptr)), a_dst->data.ptr)" + + b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst)" + ": wuffs_base__make_slice_u8(NULL, 0))") return nil } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c831e4d0..6c1136a7 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6440,8 +6440,7 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, } v_written = (a_dst ? wuffs_base__io__since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr)), - a_dst->data.ptr) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) : wuffs_base__make_slice_u8(NULL, 0)); if (((uint64_t)(v_written.len)) >= 32768) { v_written = wuffs_base__slice_u8__suffix(v_written, 32768); @@ -11488,8 +11487,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, v_checksum_got = wuffs_crc32__ieee_hasher__update( &self->private_data.f_checksum, (a_dst ? wuffs_base__io__since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr)), - a_dst->data.ptr) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) : wuffs_base__make_slice_u8(NULL, 0))); v_decoded_length_got += ((uint32_t)( ((a_dst ? wuffs_base__io__count_since( @@ -11852,8 +11850,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, v_checksum_got = wuffs_adler32__hasher__update( &self->private_data.f_checksum, (a_dst ? wuffs_base__io__since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr)), - a_dst->data.ptr) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) : wuffs_base__make_slice_u8(NULL, 0))); } if (wuffs_base__status__is_ok(v_status)) {