From patchwork Mon Nov 4 18:14:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35632 Received: (qmail 27430 invoked by alias); 4 Nov 2019 18:14:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 27417 invoked by uid 89); 4 Nov 2019 18:14:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 04 Nov 2019 18:14:10 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id B95BC203AC; Mon, 4 Nov 2019 13:14:08 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 727D6203AF; Mon, 4 Nov 2019 13:14:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 554C52816A; Mon, 4 Nov 2019 13:14:07 -0500 (EST) X-Gerrit-PatchSet: 5 Date: Mon, 4 Nov 2019 13:14:07 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Christian Biesinger , gdb-patches@sourceware.org Cc: Tom Tromey Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Add static_asserts for the sizes of space-critical structs X-Gerrit-Change-Id: Idd68320aa3e79ee7cc749019724636a58ce4b9c6 X-Gerrit-Change-Number: 306 X-Gerrit-ChangeURL: X-Gerrit-Commit: 3573abe1de0f72eba731b27eed9a002975cd7a01 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, cbiesinger@google.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-75-g9005159e5d Message-Id: <20191104181407.554C52816A@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/306 ...................................................................... Add static_asserts for the sizes of space-critical structs Specifically the three structs mentioned in symtab.h: - general_symbol_info - symbol - partial_symbol This ensures that those structs won't accidentally get bigger. gdb/ChangeLog: 2019-11-04 Christian Biesinger * psympriv.h: Add static_asserts for sizeof (general_symbol_info) and sizeof (symbol). * symtab.h: Add a static_assert for sizeof (partial_symbol). Change-Id: Idd68320aa3e79ee7cc749019724636a58ce4b9c6 --- M gdb/ChangeLog M gdb/psympriv.h M gdb/symtab.h 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7c5efce..41daef6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-11-04 Christian Biesinger + + * psympriv.h: Add static_asserts for sizeof (general_symbol_info) + and sizeof (symbol). + * symtab.h: Add a static_assert for sizeof (partial_symbol). + 2019-11-04 Rainer Orth * NEWS (Changes since GDB 8.3): Document Solaris 10 removal. diff --git a/gdb/psympriv.h b/gdb/psympriv.h index 19d692b..c81261a 100644 --- a/gdb/psympriv.h +++ b/gdb/psympriv.h @@ -82,6 +82,12 @@ ENUM_BITFIELD(address_class) aclass : SYMBOL_ACLASS_BITS; }; +/* This struct is size-critical (see comment at the to of symtab.h), so this + assert makes sure the size doesn't change accidentally. Be careful when + purposely increasing the size. */ +gdb_static_assert ((sizeof (void *) == 8 && sizeof (partial_symbol) == 40) + || (sizeof (void *) == 4 && sizeof (partial_symbol) == 24)); + /* A convenience enum to give names to some constants used when searching psymtabs. This is internal to psymtab and should not be used elsewhere. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index eac44ae..83b75d1 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -446,6 +446,13 @@ short section; }; +/* This struct is size-critical (see comment at the top), so this assert + makes sure the size doesn't change accidentally. Be careful when + purposely increasing the size. */ +gdb_static_assert ((sizeof (void *) == 8 && sizeof (general_symbol_info) == 32) + || (sizeof (void *) == 4 && + sizeof (general_symbol_info) == 20)); + extern void symbol_set_demangled_name (struct general_symbol_info *, const char *, struct obstack *); @@ -1187,6 +1194,12 @@ struct symbol *hash_next; }; +/* This struct is size-critical (see comment at the top), so this assert + makes sure the size doesn't change accidentally. Be careful when + purposely increasing the size. */ +gdb_static_assert ((sizeof (void *) == 8 && sizeof (symbol) == 72) + || (sizeof (void *) == 4 && sizeof (symbol) == 40)); + /* Several lookup functions return both a symbol and the block in which the symbol is found. This structure is used in these cases. */