From patchwork Tue Nov 21 12:04:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lancelot SIX X-Patchwork-Id: 80461 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 886F438582A0 for ; Tue, 21 Nov 2023 12:06:25 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2087.outbound.protection.outlook.com [40.107.96.87]) by sourceware.org (Postfix) with ESMTPS id D34863858410 for ; Tue, 21 Nov 2023 12:05:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D34863858410 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=amd.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D34863858410 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.96.87 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1700568359; cv=pass; b=aaSGtV5DUK7Ns33wusjwRM4OPsJZmWKcD5jOVOP7cv9k077w36cdi8iMVR5mJ9SfSW3S6Wcc633xRYAf1v2cPZTKlMFAwD5tRdAv6Zr4tYZoDGesysRgbHzI+R+HojUfvOWL54KMkclm3UIsOGWc2SlyJiHfiutTSV4JOR1epRg= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1700568359; c=relaxed/simple; bh=HAH9Ry4oL/Bh/0ON7BPbs+09v5XAxn4eWPAF7VJ/zMU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=grtgk7DC5Av4so32mvugCN/FKLCvIdeyyTavCR7BJxtMukWBOlDyQ+IWvPjCzjGo9k7pDDLoEsoDJ/Iltxksbf6BGvZ4k2b7GBVIZcJqpbkaFpyq9WhZW26hs3cQ4MBZyRPVc1msYSJvDnfS7t2Lm036r36K3xj1jVPawugMmqM= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=flrnb5Cqzu6F81ceih3Y6GuK/hFWeCi+3oEwH2ydUeYR1S89+AGtD4Egml/sHWRZzYpGK/ENT059WWlLcC6qzlwAmWnRFBuO3NXvaJs7I1/q6Pgb4a+6ZMxHmISR5nyJnsqdD4lAV5fNUEOMWQY/6BfdvM8b7RfF77jjgeZng6ng6v/ABSwzKVxq6Qod2Xe0BIoXNPdmrNgctchs96Yp9Qfxrw0V/NCNePW5btqwjy+kK6gX9qyZ9AXLk9fvT1FTPZbCZgPity4UAbpS3awCdXySGrqpSxsByDh+Cwxs616EqRgfvV8sMnB5f7TMqhk28tfIAMIRiwvqUqtOuYh+4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XKKRNt7JMiTTn/7fDV7Jei/pFm7kIt/kp/6lpHjZrCE=; b=KdM/8OJCmgWH7ckvbTWgDyKi8CUL6gXDvIT+Mk7U1LJBuCccNMQLWDNKje99/WYYOm/gsdz3YcTn84gk5eVjPSBxFmGQrSvwEZ8SOQ3fgKhXqZ5bGYwWHEwZs3OGFmOQ+aTEeiZvTYLIOU0LlqDBnmqRwuUEeteJ1DCGTXb0wpp//ENC1U6l1NtR+CCMRgeioo/4xCsc0mQcl6zs4xjR74RdN6vMLAV7qErcitgdTXGtBFPq0DI9KF6Ay9Cd7MeNJ2DM4pnOORcUvhOLRkA3LahdsbqnL5WOhYKkkP+NEbCmrYdv2wLE+t8P5TWltHjTaFWl4/FbCH5gHYGdhdSNEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=sourceware.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XKKRNt7JMiTTn/7fDV7Jei/pFm7kIt/kp/6lpHjZrCE=; b=eAiPHL0pmE6WPvJWcBqWCsxqo+Poq8d0omurtVEoPSOnGoocRskvbDIdxJ/OTDosRirQh/JABkd8eBctavbyAPw2MeQgD1wzzYfesoMsZE+NAZFeII4MJB5nlSWZpluc49BK0cVamBFoZTGsCflyEUlgh3C2M9N0cTWptQXRxOE= Received: from MN2PR12CA0036.namprd12.prod.outlook.com (2603:10b6:208:a8::49) by MN0PR12MB5835.namprd12.prod.outlook.com (2603:10b6:208:37a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.18; Tue, 21 Nov 2023 12:05:54 +0000 Received: from MN1PEPF0000F0E4.namprd04.prod.outlook.com (2603:10b6:208:a8:cafe::d9) by MN2PR12CA0036.outlook.office365.com (2603:10b6:208:a8::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.28 via Frontend Transport; Tue, 21 Nov 2023 12:05:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by MN1PEPF0000F0E4.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7025.12 via Frontend Transport; Tue, 21 Nov 2023 12:05:54 +0000 Received: from hpe6u-23.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 21 Nov 2023 06:05:52 -0600 From: Lancelot Six To: CC: , , Lancelot Six Subject: [COMMITTED PATCH v2 8/9] gdb/disasm.h: Mark callbacks noexcept unconditionally Date: Tue, 21 Nov 2023 12:04:59 +0000 Message-ID: <20231121120500.1394523-9-lancelot.six@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231028204821.fp5hh7bahrmrnpjl@hpe6u-23> References: <20231028204821.fp5hh7bahrmrnpjl@hpe6u-23> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E4:EE_|MN0PR12MB5835:EE_ X-MS-Office365-Filtering-Correlation-Id: 62e89fa1-6406-4d59-c47e-08dbea8a36a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mXZF+XTKTPMy0QPFBUFVVy088iAArhaURL8WvA5kg9PogvPqJP4cKyekKY/JldGm4MSolx2qxO5kN3jONRWEPOGcCyz4Cj33pVDeCv3MRUpuYOLR/cQiZR0r2O5bXfr64dCG7KH2zQgQMSnUK7ccWMx2GR6c6ob/MSEhG9n2VsUjALXmRAmsQypfXRK/I2qHuZiT4VrdjftAYCdyJfmw8pt5hz5Ob+jezpO2sQvGORwR2C+k/n5X/W24t1N7gZHcNJpG//bPQTGXDWY5AkYTHxVQsnHkbAQSizEUZH5JtG/P0XuNc16tsHrtvIrV1DmZaSFidgi2vBVK0ox6Dxn0aYJPAOoCMJuCGGm9gs1ZnRCA3qJNiBu8yHC3ldYalc3cRiXknlSJi2SwScOhN/19R0h74qrPW/Lp6naZ3eZ9+JDToidNKb/5SErXy4ucr4fZ4JZxVuDIr8ZVtLQsrDJxwcRvP+PlzXT7ENyw+5Et4byyeK9ocEjTmby5Mo0bfaX0apndrassyS9OuFlhv915pk9NvgCiakxTbIgvt2BuYXCsxKaTfjeynP10rjLOmRZui6R0qEI7x1vE2T9qW+O8V1KCWC3WSYK8WJgi5xN/5i8swTQVwTSUFc4lcGBb6u57gh1dcMIZvDUvKzY5LQcP/Yv+fyW5T7lq9vLP1OJJ82jPlsyqT1vTSGNKtD+IkROyaNyp8lPe3FAN6Bx34i02b+PlVH4DLup5FlQRVYS9eFkvcxMQpjoC3Ucawj1XdMBjrQonC/bwERAu1mMqP6TBD229bZcxxc3qH94z5yRCMzqmiG9cxRQc3Vhe9KcVgCVI X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(396003)(39860400002)(136003)(346002)(376002)(230173577357003)(230273577357003)(230922051799003)(1800799012)(186009)(82310400011)(451199024)(64100799003)(36840700001)(40470700004)(46966006)(83380400001)(36860700001)(40480700001)(40460700003)(356005)(81166007)(70586007)(54906003)(70206006)(5660300002)(86362001)(8936002)(316002)(4326008)(8676002)(6916009)(44832011)(2906002)(41300700001)(7696005)(478600001)(47076005)(426003)(82740400003)(336012)(36756003)(2616005)(1076003)(26005)(16526019)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2023 12:05:54.5546 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62e89fa1-6406-4d59-c47e-08dbea8a36a1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5835 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Given that C++17 is now a requirement for GDB, update gdb/disasm.h to define callback function types noexcept unconditionally. The pre-C++17 configuration is not supported anymore. Change-Id: I0a38e22b7912c70a11425363a991f0b01614343e Approved-By: Tom Tromey Approved-By: Pedro Alves --- gdb/disasm.h | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/gdb/disasm.h b/gdb/disasm.h index 5596bd62a10..90fa1dfc02b 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -26,12 +26,6 @@ struct gdbarch; struct ui_out; struct ui_file; -#if __cplusplus >= 201703L -#define LIBOPCODE_CALLBACK_NOEXCEPT noexcept -#else -#define LIBOPCODE_CALLBACK_NOEXCEPT -#endif - /* A wrapper around a disassemble_info and a gdbarch. This is the core set of data that all disassembler sub-classes will need. This class doesn't actually implement the disassembling process, that is something @@ -58,27 +52,18 @@ struct gdb_disassemble_info protected: /* Types for the function callbacks within m_di. The actual function - signatures here are taken from include/dis-asm.h. The noexcept macro - expands to 'noexcept' for C++17 and later, otherwise, it expands to - nothing. This is because including noexcept was ignored for function - types before C++17, but both GCC and Clang warn that the noexcept - will become relevant when you switch to C++17, and this warning - causes the build to fail. */ + signatures here are taken from include/dis-asm.h. */ using read_memory_ftype = int (*) (bfd_vma, bfd_byte *, unsigned int, struct disassemble_info *) - LIBOPCODE_CALLBACK_NOEXCEPT; + noexcept; using memory_error_ftype - = void (*) (int, bfd_vma, struct disassemble_info *) - LIBOPCODE_CALLBACK_NOEXCEPT; + = void (*) (int, bfd_vma, struct disassemble_info *) noexcept; using print_address_ftype - = void (*) (bfd_vma, struct disassemble_info *) - LIBOPCODE_CALLBACK_NOEXCEPT; + = void (*) (bfd_vma, struct disassemble_info *) noexcept; using fprintf_ftype - = int (*) (void *, const char *, ...) - LIBOPCODE_CALLBACK_NOEXCEPT; + = int (*) (void *, const char *, ...) noexcept; using fprintf_styled_ftype - = int (*) (void *, enum disassembler_style, const char *, ...) - LIBOPCODE_CALLBACK_NOEXCEPT; + = int (*) (void *, enum disassembler_style, const char *, ...) noexcept; /* Constructor, many fields in m_di are initialized from GDBARCH. The remaining arguments are function callbacks that are written into m_di.