From bdba035779a0d2cf3c39680b34418904728004cd Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 24 Sep 2023 12:18:52 +1000 Subject: [PATCH] cgen: ignore -Wcast-qual when making a roslice --- internal/cgen/base/fundamental-private.h | 14 ++++++++++++++ internal/cgen/expr.go | 8 ++++++-- release/c/wuffs-unsupported-snapshot.c | 22 ++++++++++++++++++---- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/internal/cgen/base/fundamental-private.h b/internal/cgen/base/fundamental-private.h index 3eb572c4..f075f0c4 100644 --- a/internal/cgen/base/fundamental-private.h +++ b/internal/cgen/base/fundamental-private.h @@ -61,6 +61,20 @@ // -------- +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-qual" +#endif +static inline uint8_t* // +wuffs_base__strip_const_from_u8_ptr(const uint8_t* ptr) { + return (uint8_t*)ptr; +} +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + +// -------- + static inline wuffs_base__empty_struct // wuffs_base__ignore_status(wuffs_base__status z) { return wuffs_base__make_empty_struct(); diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index c57531d4..7d06ca82 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -171,12 +171,16 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, sideEffectsOnly bool, depth u } else { b.writes("wuffs_base__make_slice_u8_ij(") } - if lhs.MType().IsReadOnly() { - b.writes("(uint8_t*)") + lhsIsReadOnly := lhs.MType().IsReadOnly() + if lhsIsReadOnly { + b.writes("wuffs_base__strip_const_from_u8_ptr(") } if err := g.writeExpr(b, lhs, false, depth); err != nil { return err } + if lhsIsReadOnly { + b.writes(")") + } if mhs == nil { // No-op. } else { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 3254b4dd..0232b45e 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -12658,6 +12658,20 @@ extern "C" { // -------- +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-qual" +#endif +static inline uint8_t* // +wuffs_base__strip_const_from_u8_ptr(const uint8_t* ptr) { + return (uint8_t*)ptr; +} +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + +// -------- + static inline wuffs_base__empty_struct // wuffs_base__ignore_status(wuffs_base__status z) { return wuffs_base__make_empty_struct(); @@ -43422,13 +43436,13 @@ wuffs_jpeg__decoder__use_default_huffman_table( wuffs_base__status v_status = wuffs_base__make_status(NULL); if (a_tc4_th == 0u) { - v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_LUMA, 29); + v_data = wuffs_base__make_slice_u8(wuffs_base__strip_const_from_u8_ptr(WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_LUMA), 29); } else if (a_tc4_th == 1u) { - v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_CHROMA, 29); + v_data = wuffs_base__make_slice_u8(wuffs_base__strip_const_from_u8_ptr(WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_CHROMA), 29); } else if (a_tc4_th == 4u) { - v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_LUMA, 179); + v_data = wuffs_base__make_slice_u8(wuffs_base__strip_const_from_u8_ptr(WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_LUMA), 179); } else if (a_tc4_th == 5u) { - v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_CHROMA, 179); + v_data = wuffs_base__make_slice_u8(wuffs_base__strip_const_from_u8_ptr(WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_CHROMA), 179); } else { status = wuffs_base__make_status(wuffs_jpeg__error__missing_huffman_table); goto exit;