From patchwork Tue Oct 2 04:44:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 29612 Received: (qmail 120002 invoked by alias); 2 Oct 2018 04:44:34 -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 119802 invoked by uid 89); 2 Oct 2018 04:44:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Defines, 1647 X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.146.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 02 Oct 2018 04:44:25 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 75E4F11D1048 for ; Mon, 1 Oct 2018 23:44:23 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 7CXngpG5579N37CXngxBUW; Mon, 01 Oct 2018 23:44:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=d5bBXI2IcC5wx4YbjEv0sMRK/gi+mjVWxPn+fJOoTpE=; b=K+2qEphW9wbn7LJMyoEHPkw6Xy zUbN/fPmrX3FwhvA1X5on77+q56T+LyoRd8P8FuSPaiI2Y2EmF16hR0AJzewlVaJppy9Q5zQPBYFd LYeEYRh9LEQoWX2j1q2r2mcoU; Received: from 97-122-190-66.hlrn.qwest.net ([97.122.190.66]:32984 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1g7CXn-003mHT-7n; Mon, 01 Oct 2018 23:44:23 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 03/10] Use unsigned as base type for some enums Date: Mon, 1 Oct 2018 22:44:13 -0600 Message-Id: <20181002044420.17628-4-tom@tromey.com> In-Reply-To: <20181002044420.17628-1-tom@tromey.com> References: <20181002044420.17628-1-tom@tromey.com> -fsanitize=undefined complains about using operator~ on various enum types that are used with DEF_ENUM_FLAGS_TYPE. This patch fixes these problems by explicitly setting the base type for these enums to unsigned. It also adds a static assert to enum_flags to ensure that future enums used this way have an unsigned underlying type. gdb/ChangeLog 2018-10-01 Tom Tromey * common/enum-flags.h (enum_flags::operator~): Add static assert. * symfile-add-flags.h (enum symfile_add_flag): Use unsigned as base type. * objfile-flags.h (enum objfile_flag): Use unsigned as base type. * gdbtypes.h (enum type_instance_flag_value): Use unsigned as base type. * c-lang.h (enum c_string_type_values): Use unsigned as base type. * btrace.h (enum btrace_thread_flag): Use unsigned as base type. --- gdb/ChangeLog | 12 ++++++++++++ gdb/btrace.h | 2 +- gdb/c-lang.h | 2 +- gdb/common/enum-flags.h | 1 + gdb/gdbtypes.h | 2 +- gdb/objfile-flags.h | 2 +- gdb/symfile-add-flags.h | 2 +- 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gdb/btrace.h b/gdb/btrace.h index bfb0b9f278..0448bd6d49 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -228,7 +228,7 @@ struct btrace_call_history }; /* Branch trace thread flags. */ -enum btrace_thread_flag +enum btrace_thread_flag : unsigned { /* The thread is to be stepped forwards. */ BTHR_STEP = (1 << 0), diff --git a/gdb/c-lang.h b/gdb/c-lang.h index ae17abd20f..f9eab04730 100644 --- a/gdb/c-lang.h +++ b/gdb/c-lang.h @@ -35,7 +35,7 @@ struct parser_state; /* The various kinds of C string and character. Note that these values are chosen so that they may be or'd together in certain ways. */ -enum c_string_type_values +enum c_string_type_values : unsigned { /* An ordinary string: "value". */ C_STRING = 0, diff --git a/gdb/common/enum-flags.h b/gdb/common/enum-flags.h index 82568a5a3d..dad59cec86 100644 --- a/gdb/common/enum-flags.h +++ b/gdb/common/enum-flags.h @@ -164,6 +164,7 @@ public: } enum_flags operator~ () const { + gdb_static_assert (std::is_unsigned::value); return (enum_type) ~underlying_value (); } diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 32b58dcc61..a115857c0a 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -193,7 +193,7 @@ enum type_code /* * Some bits for the type's instance_flags word. See the macros below for documentation on each bit. */ -enum type_instance_flag_value +enum type_instance_flag_value : unsigned { TYPE_INSTANCE_FLAG_CONST = (1 << 0), TYPE_INSTANCE_FLAG_VOLATILE = (1 << 1), diff --git a/gdb/objfile-flags.h b/gdb/objfile-flags.h index aeaa8fbc04..6f5760d021 100644 --- a/gdb/objfile-flags.h +++ b/gdb/objfile-flags.h @@ -25,7 +25,7 @@ /* Defines for the objfile flags field. Defined in a separate file to break circular header dependencies. */ -enum objfile_flag +enum objfile_flag : unsigned { /* When an object file has its functions reordered (currently Irix-5.2 shared libraries exhibit this behaviour), we will need diff --git a/gdb/symfile-add-flags.h b/gdb/symfile-add-flags.h index 3c07513e39..35241fe4a0 100644 --- a/gdb/symfile-add-flags.h +++ b/gdb/symfile-add-flags.h @@ -26,7 +26,7 @@ symbol_file_add, etc. Defined in a separate file to break circular header dependencies. */ -enum symfile_add_flag +enum symfile_add_flag : unsigned { /* Be chatty about what you are doing. */ SYMFILE_VERBOSE = 1 << 1,