diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index d5cb53bb..0eeb54ea 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -1021,14 +1021,12 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error { b.writes(" #pragma GCC diagnostic pop\n") b.writes(" #endif\n") b.writes("} else {\n") - b.writes(" void* p = &(self->private_impl);\n") - b.writes(" size_t n = sizeof(self->private_impl);\n") b.writes(" if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {\n") - b.writes(" p = self;\n") - b.writes(" n = sizeof(*self);\n") + b.writes(" memset(self, 0, sizeof(*self));\n") b.writes(" initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED;\n") + b.writes(" } else {\n") + b.writes(" memset(&(self->private_impl), 0, sizeof(self->private_impl));\n") b.writes(" }\n") - b.writes(" memset(p, 0, n);\n") b.writes("}\n\n") // Call any ctors on sub-structs. diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index aabd517a..c454205f 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -5035,15 +5035,13 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } self->private_impl.magic = WUFFS_BASE__MAGIC; @@ -6047,15 +6045,13 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } self->private_impl.magic = WUFFS_BASE__MAGIC; @@ -6342,15 +6338,13 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } self->private_impl.magic = WUFFS_BASE__MAGIC; @@ -8102,15 +8096,13 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } self->private_impl.magic = WUFFS_BASE__MAGIC; @@ -8699,15 +8691,13 @@ wuffs_gif__decoder__initialize(wuffs_gif__decoder* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } { @@ -11264,15 +11254,13 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } { @@ -11747,15 +11735,13 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, #pragma GCC diagnostic pop #endif } else { - void* p = &(self->private_impl); - size_t n = sizeof(self->private_impl); if ((initialize_flags & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) { - p = self; - n = sizeof(*self); + memset(self, 0, sizeof(*self)); initialize_flags |= WUFFS_INITIALIZE__ALREADY_ZEROED; + } else { + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } - memset(p, 0, n); } {