diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index ca0949bd..93602aef 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -427,10 +427,8 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e temp := g.currFunk.tempW g.currFunk.tempW++ - if !n.ProvenNotToSuspend() { - b.printf("if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) { goto short_read_src; }") - g.currFunk.shortReads = append(g.currFunk.shortReads, "src") - } + b.printf("if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) { goto short_read_src; }") + g.currFunk.shortReads = append(g.currFunk.shortReads, "src") // TODO: watch for passing an array type to writeCTypeName? In C, an // array type can decay into a pointer. @@ -500,11 +498,9 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e } else { switch method.Ident() { case t.IDWriteU8: - if !n.ProvenNotToSuspend() { - b.writes("if (ioptr_dst == iobounds1_dst) { status = WUFFS_BASE__SUSPENSION_SHORT_WRITE; goto suspend; }\n") - } - - b.printf("*ioptr_dst++ = ") + b.writes("if (ioptr_dst == iobounds1_dst) {\n" + + "status = WUFFS_BASE__SUSPENSION_SHORT_WRITE; goto suspend; }\n" + + "*ioptr_dst++ = ") x := n.Args()[0].AsArg().Value() if err := g.writeExpr(b, x, replaceCallSuspendibles, depth); err != nil { return err diff --git a/lang/check/optimize.go b/lang/check/optimize.go index a854ed2a..eecdc610 100644 --- a/lang/check/optimize.go +++ b/lang/check/optimize.go @@ -212,15 +212,6 @@ func (q *checker) optimizeSuspendible(n *a.Expr, depth uint32) error { return nil } - if advance := ioMethodAdvance(nMethod); advance != nil { - if ok, err := q.optimizeIOMethodAdvance(nReceiver, advance, true); err != nil { - return err - } else if ok { - // TODO: no longer used; delete. - n.SetProvenNotToSuspend() - } - } - return nil } @@ -296,25 +287,3 @@ func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, up }) return retOK, retErr } - -func ioMethodAdvance(x t.ID) *big.Int { - switch x { - case t.IDReadU8, t.IDWriteU8: - return one - case t.IDReadU16BE, t.IDReadU16LE, t.IDWriteU16BE, t.IDWriteU16LE: - return two - case t.IDReadU24BE, t.IDReadU24LE, t.IDWriteU24BE, t.IDWriteU24LE: - return three - case t.IDReadU32BE, t.IDReadU32LE, t.IDWriteU32BE, t.IDWriteU32LE: - return four - case t.IDReadU40BE, t.IDReadU40LE, t.IDWriteU40BE, t.IDWriteU40LE: - return five - case t.IDReadU48BE, t.IDReadU48LE, t.IDWriteU48BE, t.IDWriteU48LE: - return six - case t.IDReadU56BE, t.IDReadU56LE, t.IDWriteU56BE, t.IDWriteU56LE: - return seven - case t.IDReadU64BE, t.IDReadU64LE, t.IDWriteU64BE, t.IDWriteU64LE: - return eight - } - return nil -}