diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 5d5d06a9..4231c529 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -145,7 +145,7 @@ 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))) : 0)", prefix, name, prefix, name) + b.printf(", ((uint64_t)(%s%s%s - %s%s%s))) : 0)", iopPrefix, prefix, name, io0Prefix, prefix, name) return nil case t.IDMark: @@ -250,7 +250,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))) : 0)") + b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst))) : 0)") return nil case t.IDHistoryAvailable: diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 6a146a18..7017b242 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -10918,7 +10918,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, wuffs_base__u64__sat_add_indirect( &self->private_impl.f_compressed_ri, (v_r ? wuffs_base__io__count_since( - v_mark, ((uint64_t)(iop_v_r - v_r->data.ptr))) + v_mark, ((uint64_t)(iop_v_r - io0_v_r))) : 0)); v_r = o_0_v_r; iop_v_r = o_0_iop_v_r; @@ -11505,7 +11505,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, : wuffs_base__make_slice_u8(NULL, 0))); v_decoded_length_got += ((uint32_t)( ((a_dst ? wuffs_base__io__count_since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr))) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst))) : 0) & 4294967295))); }