From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 76876 invoked by alias); 25 Nov 2019 22:13:11 -0000 Mailing-List: contact gdb-testers-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-testers-owner@sourceware.org Received: (qmail 76863 invoked by uid 89); 25 Nov 2019 22:13:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: kwanyin.sergiodj.net Received: from kwanyin.sergiodj.net (HELO kwanyin.sergiodj.net) (158.69.185.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 25 Nov 2019 22:13:10 +0000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [binutils-gdb] Remove symbol-related static asserts From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Message-Id: Date: Mon, 25 Nov 2019 22:13:00 -0000 X-SW-Source: 2019-q4/txt/msg02905.txt.bz2 *** TEST RESULTS FOR COMMIT d1aa3cf0bb1a9d7162fc9790258f64f5abffaa55 *** commit d1aa3cf0bb1a9d7162fc9790258f64f5abffaa55 Author: Tom Tromey AuthorDate: Mon Nov 11 07:43:13 2019 -0700 Commit: Tom Tromey CommitDate: Wed Nov 13 12:52:40 2019 -0700 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-13 Tom Tromey PR build/25182: * psympriv.h (partial_symbol): Remove static assert. * symtab.h (general_symbol_info, symbol): Remove static assert. Change-Id: I51940fb2240c474838b48494b5072081701789bb diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4f40ea82ee..be4c5a51f1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-11-13 Tom Tromey + + PR build/25182: + * psympriv.h (partial_symbol): Remove static assert. + * symtab.h (general_symbol_info, symbol): Remove static assert. + 2019-11-12 Andrew Burgess * gdbsupport/format.c (format_pieces::format_pieces): Support diff --git a/gdb/psympriv.h b/gdb/psympriv.h index c81261a38f..19d692bd23 100644 --- a/gdb/psympriv.h +++ b/gdb/psympriv.h @@ -82,12 +82,6 @@ struct partial_symbol 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 390aee4218..a6bd3c44b8 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -447,13 +447,6 @@ struct general_symbol_info 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 *); @@ -1204,12 +1197,6 @@ struct symbol : public general_symbol_info, public allocate_on_obstack struct symbol *hash_next = nullptr; }; -/* 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. */