From patchwork Tue Nov 12 19:56:43 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: 35847 Received: (qmail 93598 invoked by alias); 12 Nov 2019 19:56:48 -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 93589 invoked by uid 89); 12 Nov 2019 19:56:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.6 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=vary 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; Tue, 12 Nov 2019 19:56:46 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id CB9F820308; Tue, 12 Nov 2019 14:56:44 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 7B9EA201E8; Tue, 12 Nov 2019 14:56:43 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 5D9E820AF6; Tue, 12 Nov 2019 14:56:43 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Tue, 12 Nov 2019 14:56:43 -0500 From: "Tom Tromey (Code Review)" To: Christian Biesinger , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v2] Remove symbol-related static asserts X-Gerrit-Change-Id: I51940fb2240c474838b48494b5072081701789bb X-Gerrit-Change-Number: 611 X-Gerrit-ChangeURL: X-Gerrit-Commit: db599fdcf22e154571a55285b00d096af42912d3 In-Reply-To: References: Reply-To: tromey@sourceware.org, cbiesinger@google.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-76-gf8b6da0ab5 Message-Id: <20191112195643.5D9E820AF6@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/611 ...................................................................... Remove symbol-related static asserts commit 3573abe1d added static asserts to ensure that symbol sizes don't vary. However, this failed to build on Windows, on at least one ARM platform (see PR build/25182) and internally at AdaCore for PPC. So, I think it is probably best to just remove these assertions, effectively reverting 3573abe1d. gdb/ChangeLog 2019-11-12 Tom Tromey PR build/25182: * psympriv.h (partial_symbol): Remove static assert. * symtab.h (general_symbol_info, symbol): Remove static assert. Change-Id: I51940fb2240c474838b48494b5072081701789bb --- M gdb/ChangeLog M gdb/psympriv.h M gdb/symtab.h 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 23095e0..21ab575 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-11-12 Tom Tromey + + PR build/25182: + * psympriv.h (partial_symbol): Remove static assert. + * symtab.h (general_symbol_info, symbol): Remove static assert. + 2019-11-12 Tom Tromey * tui/tui-layout.c (show_layout): Set current_layout. diff --git a/gdb/psympriv.h b/gdb/psympriv.h index c81261a..19d692b 100644 --- a/gdb/psympriv.h +++ b/gdb/psympriv.h @@ -82,12 +82,6 @@ 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 111a0f9..eac44ae 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -446,13 +446,6 @@ 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 *); @@ -1194,12 +1187,6 @@ 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. */