Remove unnecessary iox_etc nullptr checks

This commit is contained in:
Nigel Tao committed 2019-07-07 17:10:02 +10:00
1 parent 3ca0c3dd1f
commit 2b40cf00c4
2 files changed
+27 -36

No files matched your search

+11 -14
View File
@@ -141,16 +141,15 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
return nil return nil
case t.IDCountSince: case t.IDCountSince:
b.printf("(%s%s ? wuffs_base__io__count_since(", prefix, name) b.printf("wuffs_base__io__count_since(")
if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil {
return err return err
} }
b.printf(", ((uint64_t)(%s%s%s - %s%s%s))) : 0)", iopPrefix, prefix, name, io0Prefix, prefix, name) b.printf(", ((uint64_t)(%s%s%s - %s%s%s)))", iopPrefix, prefix, name, io0Prefix, prefix, name)
return nil return nil
case t.IDMark: case t.IDMark:
b.printf("(%s%s ? ((uint64_t)(%s%s%s - %s%s%s)) : 0)", b.printf("((uint64_t)(%s%s%s - %s%s%s))", iopPrefix, prefix, name, io0Prefix, prefix, name)
prefix, name, iopPrefix, prefix, name, io0Prefix, prefix, name)
return nil return nil
case t.IDPosition: case t.IDPosition:
@@ -159,13 +158,12 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
return nil return nil
case t.IDSince: case t.IDSince:
b.printf("(%s%s ? wuffs_base__io__since(", prefix, name) b.printf("wuffs_base__io__since(")
if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil {
return err return err
} }
b.printf(", ((uint64_t)(iop_%s%s - %s%s)), %s%s)"+ b.printf(", ((uint64_t)(%s%s%s - %s%s%s)), %s%s%s)",
": wuffs_base__make_slice_u8(NULL, 0))", iopPrefix, prefix, name, io0Prefix, prefix, name, io0Prefix, prefix, name)
prefix, name, io0Prefix, name, io0Prefix, name)
return nil return nil
case t.IDSkipFast: case t.IDSkipFast:
@@ -246,11 +244,11 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
return g.writeArgs(b, args, depth) return g.writeArgs(b, args, depth)
case t.IDCountSince: case t.IDCountSince:
b.printf("(a_dst ? wuffs_base__io__count_since(") b.printf("wuffs_base__io__count_since(")
if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil {
return err return err
} }
b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst))) : 0)") b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst)))")
return nil return nil
case t.IDHistoryAvailable: case t.IDHistoryAvailable:
@@ -258,7 +256,7 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
return nil return nil
case t.IDMark: case t.IDMark:
b.printf("(a_dst ? ((uint64_t)(iop_a_dst - io0_a_dst)) : 0)") b.printf("((uint64_t)(iop_a_dst - io0_a_dst))")
return nil return nil
case t.IDPosition: case t.IDPosition:
@@ -266,12 +264,11 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
return nil return nil
case t.IDSince: case t.IDSince:
b.printf("(a_dst ? wuffs_base__io__since(") b.printf("wuffs_base__io__since(")
if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil {
return err return err
} }
b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst)" + b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst)")
": wuffs_base__make_slice_u8(NULL, 0))")
return nil return nil
} }
+16 -22
View File
@@ -6424,7 +6424,7 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self,
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
while (true) { while (true) {
v_mark = (a_dst ? ((uint64_t)(iop_a_dst - io0_a_dst)) : 0); v_mark = ((uint64_t)(iop_a_dst - io0_a_dst));
{ {
if (a_dst) { if (a_dst) {
a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr)); a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
@@ -6446,10 +6446,8 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self,
} }
goto ok; goto ok;
} }
v_written = v_written = wuffs_base__io__since(
(a_dst ? wuffs_base__io__since( v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst);
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) { if (((uint64_t)(v_written.len)) >= 32768) {
v_written = wuffs_base__slice_u8__suffix(v_written, 32768); v_written = wuffs_base__slice_u8__suffix(v_written, 32768);
wuffs_base__slice_u8__copy_from_slice( wuffs_base__slice_u8__copy_from_slice(
@@ -10905,7 +10903,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
4096), 4096),
self->private_impl.f_compressed_ri, self->private_impl.f_compressed_ri,
self->private_impl.f_compressed_wi)); self->private_impl.f_compressed_wi));
v_mark = (v_r ? ((uint64_t)(iop_v_r - io0_v_r)) : 0); v_mark = ((uint64_t)(iop_v_r - io0_v_r));
{ {
u_r.meta.ri = ((size_t)(iop_v_r - u_r.data.ptr)); u_r.meta.ri = ((size_t)(iop_v_r - u_r.data.ptr));
wuffs_base__status t_1 = wuffs_lzw__decoder__decode_io_writer( wuffs_base__status t_1 = wuffs_lzw__decoder__decode_io_writer(
@@ -10917,9 +10915,8 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
} }
wuffs_base__u64__sat_add_indirect( wuffs_base__u64__sat_add_indirect(
&self->private_impl.f_compressed_ri, &self->private_impl.f_compressed_ri,
(v_r ? wuffs_base__io__count_since( wuffs_base__io__count_since(v_mark,
v_mark, ((uint64_t)(iop_v_r - io0_v_r))) ((uint64_t)(iop_v_r - io0_v_r))));
: 0));
v_r = o_0_v_r; v_r = o_0_v_r;
iop_v_r = o_0_iop_v_r; iop_v_r = o_0_iop_v_r;
io0_v_r = o_0_io0_v_r; io0_v_r = o_0_io0_v_r;
@@ -11479,7 +11476,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self,
goto exit; goto exit;
} }
while (true) { while (true) {
v_mark = (a_dst ? ((uint64_t)(iop_a_dst - io0_a_dst)) : 0); v_mark = ((uint64_t)(iop_a_dst - io0_a_dst));
{ {
if (a_dst) { if (a_dst) {
a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr)); a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
@@ -11500,14 +11497,12 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self,
if (!self->private_impl.f_ignore_checksum) { if (!self->private_impl.f_ignore_checksum) {
v_checksum_got = wuffs_crc32__ieee_hasher__update( v_checksum_got = wuffs_crc32__ieee_hasher__update(
&self->private_data.f_checksum, &self->private_data.f_checksum,
(a_dst ? wuffs_base__io__since( wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)),
v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) io0_a_dst));
: wuffs_base__make_slice_u8(NULL, 0))); v_decoded_length_got +=
v_decoded_length_got += ((uint32_t)( ((uint32_t)((wuffs_base__io__count_since(
((a_dst ? wuffs_base__io__count_since( v_mark, ((uint64_t)(iop_a_dst - io0_a_dst))) &
v_mark, ((uint64_t)(iop_a_dst - io0_a_dst))) 4294967295)));
: 0) &
4294967295)));
} }
if (wuffs_base__status__is_ok(v_status)) { if (wuffs_base__status__is_ok(v_status)) {
goto label_2_break; goto label_2_break;
@@ -11842,7 +11837,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self,
goto exit; goto exit;
} }
while (true) { while (true) {
v_mark = (a_dst ? ((uint64_t)(iop_a_dst - io0_a_dst)) : 0); v_mark = ((uint64_t)(iop_a_dst - io0_a_dst));
{ {
if (a_dst) { if (a_dst) {
a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr)); a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
@@ -11863,9 +11858,8 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self,
if (!self->private_impl.f_ignore_checksum) { if (!self->private_impl.f_ignore_checksum) {
v_checksum_got = wuffs_adler32__hasher__update( v_checksum_got = wuffs_adler32__hasher__update(
&self->private_data.f_checksum, &self->private_data.f_checksum,
(a_dst ? wuffs_base__io__since( wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)),
v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) io0_a_dst));
: wuffs_base__make_slice_u8(NULL, 0)));
} }
if (wuffs_base__status__is_ok(v_status)) { if (wuffs_base__status__is_ok(v_status)) {
goto label_0_break; goto label_0_break;