From c4d2fa13daf8eaed7f5e12c0763b726fcbb120c5 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 14 Dec 2023 10:17:15 +1100 Subject: [PATCH] cgen: apply disableWconversion even more often --- internal/cgen/statement.go | 23 ++++++++++++++--------- release/c/wuffs-unsupported-snapshot.c | 7 +++++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 1a1dfddc..628a99e6 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -165,20 +165,25 @@ func (g *gen) writeStatementAssign1(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr b.printf("wuffs_private_impl__u%d__sat_%s_indirect(&", uBits, uOp) opName, closer = ", ", ")" - case t.IDPlusEq, t.IDMinusEq, t.IDStarEq, t.IDShiftLEq, - t.IDTildeModPlusEq, t.IDTildeModMinusEq, t.IDTildeModStarEq, t.IDTildeModShiftLEq: - if lTyp.IsNumType() { - if u := lTyp.QID()[1]; u == t.IDU8 || u == t.IDU16 { - disableWconversion = true - } - } - fallthrough - default: opName = cOpName(op) if opName == "" { return fmt.Errorf("unrecognized operator %q", op.AmbiguousForm().Str(g.tm)) } + + if op.IsAssign() { + switch op { + case t.IDAmpEq, t.IDPipeEq, t.IDHatEq, t.IDEq, t.IDEqQuestion: + // No-op. + + default: + if lTyp.IsNumType() { + if u := lTyp.QID()[1]; u == t.IDU8 || u == t.IDU16 { + disableWconversion = true + } + } + } + } } } } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 3737d21c..cda9f734 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -52324,7 +52324,14 @@ wuffs_lzma__decoder__decode_properties( goto exit; } v_lc = ((uint32_t)(((uint8_t)(v_c8 % 9u)))); +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif v_c8 /= 9u; +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif v_lp = ((uint32_t)(((uint8_t)(v_c8 % 5u)))); v_pb = ((uint32_t)(((uint8_t)(v_c8 / 5u)))); if ((v_lc + v_lp) > 4u) {