diff --git a/lang/ast/ast.go b/lang/ast/ast.go index a1b773fc..daca2e20 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -793,6 +793,10 @@ func (n *TypeExpr) IsArrayType() bool { return n.id0 == t.IDArray } +func (n *TypeExpr) IsFuncType() bool { + return n.id0 == t.IDFunc +} + func (n *TypeExpr) IsPointerType() bool { return n.id0 == t.IDNptr || n.id0 == t.IDPtr } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 69b1a706..d676efbc 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -447,6 +447,17 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { if lhs.MType().IsNumType() && rhs.Effect().Pure() { q.facts.appendBinaryOpFact(t.IDXBinaryEqEq, lhs, rhs) + + if rhs.Operator() == t.IDOpenParen { + if lTyp := rhs.LHS().AsExpr().MType(); lTyp.IsFuncType() && lTyp.Receiver().IsNumType() { + switch fn := lTyp.FuncName(); fn { + case t.IDMax, t.IDMin: + if err := q.bcheckAssignmentMaxMin(lhs, fn, rhs); err != nil { + return err + } + } + } + } } } else { @@ -541,6 +552,36 @@ func (q *checker) bcheckAssignment1(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs return rb, nil } +func (q *checker) bcheckAssignmentMaxMin(lhs *a.Expr, funcName t.ID, rhs *a.Expr) error { + if len(rhs.Args()) != 1 { + return fmt.Errorf("check: internal error: max/min has unexpected arguments") + } + op := t.ID(0) + switch funcName { + case t.IDMax: + op = t.IDXBinaryGreaterEq + case t.IDMin: + op = t.IDXBinaryLessEq + default: + return fmt.Errorf("check: internal error: max/min has unexpected function name") + } + + operands := [2]*a.Expr{ + rhs.LHS().AsExpr().LHS().AsExpr(), + rhs.Args()[0].AsArg().Value(), + } + for _, operand := range operands { + if operand.Mentions(lhs) { + continue + } + o := a.NewExpr(0, op, 0, lhs.AsNode(), nil, operand.AsNode(), nil) + o.SetMBounds(bounds{zero, one}) + o.SetMType(typeExprBool) + q.facts.appendFact(o) + } + return nil +} + func snapshot(facts []*a.Expr) []*a.Expr { return append([]*a.Expr(nil), facts...) } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ab9770cf..109a1e32 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -30013,10 +30013,12 @@ wuffs_png__decoder__filter_2( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev) { + uint64_t v_n = 0; uint64_t v_i = 0; + v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len))); v_i = 0; - while ((v_i < ((uint64_t)(a_curr.len))) && (v_i < ((uint64_t)(a_prev.len)))) { + while (v_i < v_n) { a_curr.ptr[v_i] += a_prev.ptr[v_i]; v_i += 1; } @@ -30031,6 +30033,7 @@ wuffs_png__decoder__filter_3( wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev) { uint64_t v_filter_distance = 0; + uint64_t v_n = 0; uint64_t v_i = 0; v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance)); @@ -30045,8 +30048,9 @@ wuffs_png__decoder__filter_3( v_i += 1; } } else { + v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len))); v_i = 0; - while ((v_i < ((uint64_t)(a_curr.len))) && (v_i < ((uint64_t)(a_prev.len)))) { + while (v_i < v_n) { if (v_i >= v_filter_distance) { if ((v_i - v_filter_distance) < ((uint64_t)(a_curr.len))) { a_curr.ptr[v_i] += ((uint8_t)(((((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])) + ((uint32_t)(a_prev.ptr[v_i]))) / 2))); @@ -30068,6 +30072,7 @@ wuffs_png__decoder__filter_4( wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev) { uint64_t v_filter_distance = 0; + uint64_t v_n = 0; uint64_t v_i = 0; uint32_t v_fa = 0; uint32_t v_fb = 0; @@ -30078,8 +30083,9 @@ wuffs_png__decoder__filter_4( uint32_t v_pc = 0; v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance)); + v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len))); v_i = 0; - while ((v_i < ((uint64_t)(a_curr.len))) && (v_i < ((uint64_t)(a_prev.len)))) { + while (v_i < v_n) { if (v_i < v_filter_distance) { a_curr.ptr[v_i] += a_prev.ptr[v_i]; } else { diff --git a/std/png/decode_filter_fallback.wuffs b/std/png/decode_filter_fallback.wuffs index 42364751..52d735cf 100644 --- a/std/png/decode_filter_fallback.wuffs +++ b/std/png/decode_filter_fallback.wuffs @@ -36,11 +36,18 @@ pri func decoder.filter_1!(curr: slice base.u8) { } pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) { + var n : base.u64 var i : base.u64 + n = args.curr.length().min(a: args.prev.length()) i = 0 - while (i < args.curr.length()) and (i < args.prev.length()) { - assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length()) + while i < n, + inv n <= args.curr.length(), + inv n <= args.prev.length(), + { + assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: n) + assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n) + assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n) args.curr[i] ~mod+= args.prev[i] i += 1 } endwhile @@ -48,6 +55,7 @@ pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) { pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) { var filter_distance : base.u64[..= 8] + var n : base.u64 var i : base.u64 filter_distance = this.filter_distance as base.u64 @@ -63,9 +71,15 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) { i += 1 } endwhile } else { + n = args.curr.length().min(a: args.prev.length()) i = 0 - while (i < args.curr.length()) and (i < args.prev.length()) { - assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length()) + while i < n, + inv n <= args.curr.length(), + inv n <= args.prev.length(), + { + assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: n) + assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n) + assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n) if i >= filter_distance { if (i - filter_distance) < args.curr.length() { args.curr[i] ~mod+= (( @@ -82,6 +96,7 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) { pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) { var filter_distance : base.u64[..= 8] + var n : base.u64 var i : base.u64 var fa : base.u32 @@ -93,9 +108,15 @@ pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) { var pc : base.u32 filter_distance = this.filter_distance as base.u64 + n = args.curr.length().min(a: args.prev.length()) i = 0 - while (i < args.curr.length()) and (i < args.prev.length()) { - assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length()) + while i < n, + inv n <= args.curr.length(), + inv n <= args.prev.length(), + { + assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: n) + assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n) + assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n) if i < filter_distance { args.curr[i] ~mod+= args.prev[i] } else {