From patchwork Fri Oct 13 14:44:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lancelot SIX X-Patchwork-Id: 77670 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 4C3D1385697F for ; Fri, 13 Oct 2023 14:46:29 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2046.outbound.protection.outlook.com [40.107.94.46]) by sourceware.org (Postfix) with ESMTPS id 2D301385C6DD for ; Fri, 13 Oct 2023 14:45:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2D301385C6DD 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-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mKudPe5rAVkCLJam8Ho7rYIEFvbgEwCug3fsk4DmOC4mJB5dFyMJb2LqrCw/zxUe0pIqTO56bD0+WVnxNlMoFHc5YD/UvUAALkLj/q12t9B23sbv6ZA3XjhrqSmdmOaLsGZDhj/1oLfNbg/CIlltu9hXKCZQD34YsU0DBG4C+iXSay+zN/1HeonPPlsZ1+8pClaKLJX8JWAWZqs5jgBb96wj6C6pCbcarGuy5ITomGSHx0HNpVdQSey9O7lCSy/YAV//+nQmfl/5JV2V+HXLmrLjOfHvkrawH2sfMWg2KOJntvmARmcQ5uP2i7GGHuxXn69z7bEpt5CvVpS/GPOaFg== 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=dx0N0ZEZr/TB6h/jCHUuJZP5p+9EXsap/L0EtXufk4k=; b=ElikNT1uMgVrFtJ5Io0ISXNIgT8G0ZN5TLWRcX+LQ0mzKjmVfEgqFaUPG+2s+JZXohZEDt16x8V2j+aOGw8HaaDwHoKaOI8JskflWGdG/kdb4s9m/OY/4TaWU1HRCroE5K8YJPzP7hKDZDp7UV44IZIzsJpZ5dSei1Gmgkt3BaiGOG3NQFLo12Y9K8FaMvL900G+1rwGybuNSzEq7fE49UsXH2vMWWD1DWeT6ooaHIK11h3lG/mt+myRy4AczJbP6NP6PyaOiIjRWite6ozO6RP6QW1kvBVH+jfPjbCOZyFjdfFc4h9WVTYgPNc4X/JBl56y50valNQJ7MFXq5ii3A== 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 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=dx0N0ZEZr/TB6h/jCHUuJZP5p+9EXsap/L0EtXufk4k=; b=cDJR7RuxYpotBe3AEaImAN2QJDGQZMq57eZOJceu9hMhMPLRO6LCf8xPNlUzTaymReP6rgkVBUnWbjY+QRGKQ51K9GV2GzZcYkHICO0k0cxqzvMI3sVO4isU+W0YglfINXBKYBuCsaI2YXALowu5cXj3oJtCPHI1FcQb/ebTCcA= Received: from DM6PR11CA0007.namprd11.prod.outlook.com (2603:10b6:5:190::20) by SJ2PR12MB7865.namprd12.prod.outlook.com (2603:10b6:a03:4cc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Fri, 13 Oct 2023 14:44:58 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::76) by DM6PR11CA0007.outlook.office365.com (2603:10b6:5:190::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.28 via Frontend Transport; Fri, 13 Oct 2023 14:44:58 +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 DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.22 via Frontend Transport; Fri, 13 Oct 2023 14:44:57 +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.27; Fri, 13 Oct 2023 09:44:56 -0500 From: Lancelot Six To: CC: Lancelot Six Subject: [PATCH 06/11] gdb: Use std::string_view instead of gdb::string_view Date: Fri, 13 Oct 2023 14:44:13 +0000 Message-ID: <20231013144418.3180617-7-lancelot.six@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231013144418.3180617-1-lancelot.six@amd.com> References: <20231013144418.3180617-1-lancelot.six@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017096:EE_|SJ2PR12MB7865:EE_ X-MS-Office365-Filtering-Correlation-Id: f116f087-304e-4758-b1d8-08dbcbfaf8de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rTymkXdaGAc5zsBAwmk/fwiqddXU5N8IR/7uv6H6NBychgP9HCDG99UQtYYC5wM2WJ4Lhdctocte1Gk0dgJpvpHtff5hBI1nK992OUNSICavJhoJAwqQYBiI3xqwsbRZvHwuEymEnCTMJGXezfK7QbjHJ04TqGEhuIrps9gTd80+OEKpbU5O4FBfuahip6TKBM0M33IDHPGMtV6oFAO1hO6VUw8bY8/QgcRTEc7Phm7/ryzJRHhTbi7L84105XtqXwMM06jwhMo6Gc2hCqQRwKOqxMRL0G3WCyauhWJMp6Q7V5uI0SWPanWSKRyZHb1Qyhr1nJHYO3CVaGp40P0Sa7aY38PyatEf01Y/34gi58A+kSRrf2Eqra2v76C/LQfTxTWpJvvpptlISbNjT1YXpBtO8RnNra0tKkjzg/0uvk001Ota0dmc3E0h7w1bUIlp6sQ3nwlWquEtFpFMKIl+zWIsETQgkaG+y922H90jN9Ynfh3Pkg5PRkCk/KN1EwDEs5o/rrelJW/iahTFJr1o0PaufvbODhhVM0QzMl6LQGalt7W3kjgPQ7KBAUKg6f68zBL5b1Nj6Oaj9AOtk2VXdeaqDkvG5XuWAzCJR/fkgsEI6AgzURjDDLwAYAR7WMm0dxGmkcWD87oRqxvoPrg85ADxY4ogH+p8BG9/8IB4lyKwwROQyEdHj0U1X4XmEqVJ/BQ/Zz39IhutHSGPX2i0jB7SimJdvK7AS/leUUXAzZkdHJmp5yvEJky8INzCZtBqD4UZhS9M7BZd0nDFkJ0J+Qh0LtpxqlqnJD2q6wNIslY= 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)(346002)(376002)(136003)(39860400002)(230922051799003)(186009)(64100799003)(82310400011)(451199024)(1800799009)(40470700004)(36840700001)(46966006)(1076003)(2906002)(30864003)(40460700003)(16526019)(426003)(15188155005)(336012)(2616005)(86362001)(6666004)(7696005)(16799955002)(478600001)(36860700001)(36756003)(26005)(82740400003)(356005)(83380400001)(40480700001)(47076005)(81166007)(44832011)(966005)(41300700001)(5660300002)(316002)(6916009)(70206006)(8676002)(8936002)(70586007)(4326008)(36900700001)(579004)(19623215001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2023 14:44:57.9257 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f116f087-304e-4758-b1d8-08dbcbfaf8de 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: DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7865 X-Spam-Status: No, score=-10.7 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, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP 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 GDB now requires a C++17, replace all uses of gdb::string_view with std::string_view. This change has mostly been done automatically: - gdb::string_view -> std::string_view - #include "gdbsupport/gdb_string_view.h" -> #include The implementation and tests of gdb::string_view are unchanged, they will be removed in a following patch. Change-Id: Ibb806a7e9c79eb16a55c87c6e41ad396fecf0207 --- gdb/ada-lang.c | 8 +++--- gdb/amdgpu-tdep.c | 50 ++++++++++++++++++------------------ gdb/cli/cli-script.c | 4 +-- gdb/dbxread.c | 18 ++++++------- gdb/debuginfod-support.c | 6 ++--- gdb/dwarf2/cooked-index.c | 6 ++--- gdb/dwarf2/cooked-index.h | 2 +- gdb/dwarf2/index-common.c | 2 +- gdb/dwarf2/index-common.h | 2 +- gdb/dwarf2/read.c | 2 +- gdb/elfread.c | 8 +++--- gdb/language.c | 2 +- gdb/linux-tdep.c | 8 +++--- gdb/mdebugread.c | 18 ++++++------- gdb/minsyms.c | 4 +-- gdb/minsyms.h | 2 +- gdb/psymtab.c | 2 +- gdb/psymtab.h | 4 +-- gdb/solib-rocm.c | 20 +++++++-------- gdb/split-name.c | 4 +-- gdb/split-name.h | 4 +-- gdb/stabsread.c | 2 +- gdb/symtab.c | 14 +++++----- gdb/symtab.h | 14 +++++----- gdb/tui/tui-io.c | 2 +- gdb/tui/tui-win.c | 6 ++--- gdb/xcoffread.c | 18 ++++++------- gdbsupport/common-utils.h | 8 +++--- gdbsupport/format.h | 4 +-- gdbsupport/gdb_string_view.h | 2 +- 30 files changed, 123 insertions(+), 123 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 58c70160d31..3e394619399 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1035,7 +1035,7 @@ find_case_fold_entry (uint32_t c) rather than emitting a warning. Result good to next call. */ static const char * -ada_fold_name (gdb::string_view name, bool throw_on_error = false) +ada_fold_name (std::string_view name, bool throw_on_error = false) { static std::string fold_storage; @@ -13250,7 +13250,7 @@ do_exact_match (const char *symbol_search_name, ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) { - gdb::string_view user_name = lookup_name.name (); + std::string_view user_name = lookup_name.name (); if (!user_name.empty () && user_name[0] == '<') { @@ -13269,7 +13269,7 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) { m_verbatim_p = false; - m_encoded_p = user_name.find ("__") != gdb::string_view::npos; + m_encoded_p = user_name.find ("__") != std::string_view::npos; if (!m_encoded_p) { @@ -13326,7 +13326,7 @@ literal_symbol_name_matcher (const char *symbol_search_name, const lookup_name_info &lookup_name, completion_match_result *comp_match_res) { - gdb::string_view name_view = lookup_name.name (); + std::string_view name_view = lookup_name.name (); if (lookup_name.completion_mode () ? (strncmp (symbol_search_name, name_view.data (), diff --git a/gdb/amdgpu-tdep.c b/gdb/amdgpu-tdep.c index 3a521a43977..48dc8db6bcc 100644 --- a/gdb/amdgpu-tdep.c +++ b/gdb/amdgpu-tdep.c @@ -237,7 +237,7 @@ struct amd_dbgapi_register_type_flags : public amd_dbgapi_register_type using container_type = std::vector; using const_iterator_type = container_type::const_iterator; - amd_dbgapi_register_type_flags (unsigned int bit_size, gdb::string_view name) + amd_dbgapi_register_type_flags (unsigned int bit_size, std::string_view name) : amd_dbgapi_register_type (kind::FLAGS, make_lookup_name (bit_size, name)), m_bit_size (bit_size), @@ -270,7 +270,7 @@ struct amd_dbgapi_register_type_flags : public amd_dbgapi_register_type const std::string &name () const { return m_name; } - static std::string make_lookup_name (int bits, gdb::string_view name) + static std::string make_lookup_name (int bits, std::string_view name) { std::string res = string_printf ("flags%d_t ", bits); res.append (name.data (), name.size ()); @@ -297,7 +297,7 @@ struct amd_dbgapi_register_type_enum : public amd_dbgapi_register_type using container_type = std::vector; using const_iterator_type = container_type::const_iterator; - amd_dbgapi_register_type_enum (gdb::string_view name) + amd_dbgapi_register_type_enum (std::string_view name) : amd_dbgapi_register_type (kind::ENUM, make_lookup_name (name)), m_name (name.data (), name.length ()) {} @@ -326,7 +326,7 @@ struct amd_dbgapi_register_type_enum : public amd_dbgapi_register_type const std::string &name () const { return m_name; } - static std::string make_lookup_name (gdb::string_view name) + static std::string make_lookup_name (std::string_view name) { std::string res = "enum "; res.append (name.data (), name.length ()); @@ -349,7 +349,7 @@ using amd_dbgapi_register_type_map /* Parse S as a ULONGEST, raise an error on overflow. */ static ULONGEST -try_strtoulst (gdb::string_view s) +try_strtoulst (std::string_view s) { errno = 0; ULONGEST value = strtoulst (s.data (), nullptr, 0); @@ -365,7 +365,7 @@ try_strtoulst (gdb::string_view s) #define WSOPT "[ \t]*" static const amd_dbgapi_register_type & -parse_amd_dbgapi_register_type (gdb::string_view type_name, +parse_amd_dbgapi_register_type (std::string_view type_name, amd_dbgapi_register_type_map &type_map); @@ -373,7 +373,7 @@ parse_amd_dbgapi_register_type (gdb::string_view type_name, static void parse_amd_dbgapi_register_type_enum_fields - (amd_dbgapi_register_type_enum &enum_type, gdb::string_view fields) + (amd_dbgapi_register_type_enum &enum_type, std::string_view fields) { compiled_regex regex (/* name */ "^(" IDENTIFIER ")" @@ -394,8 +394,8 @@ parse_amd_dbgapi_register_type_enum_fields auto sv_from_match = [fields] (const regmatch_t &m) { return fields.substr (m.rm_so, m.rm_eo - m.rm_so); }; - gdb::string_view name = sv_from_match (matches[1]); - gdb::string_view value_str = sv_from_match (matches[2]); + std::string_view name = sv_from_match (matches[1]); + std::string_view value_str = sv_from_match (matches[2]); ULONGEST value = try_strtoulst (value_str); if (value > std::numeric_limits::max ()) @@ -412,7 +412,7 @@ parse_amd_dbgapi_register_type_enum_fields static void parse_amd_dbgapi_register_type_flags_fields (amd_dbgapi_register_type_flags &flags_type, - int bits, gdb::string_view name, gdb::string_view fields, + int bits, std::string_view name, std::string_view fields, amd_dbgapi_register_type_map &type_map) { gdb_assert (bits == 32 || bits == 64); @@ -439,9 +439,9 @@ parse_amd_dbgapi_register_type_flags_fields auto sv_from_match = [fields] (const regmatch_t &m) { return fields.substr (m.rm_so, m.rm_eo - m.rm_so); }; - gdb::string_view field_type_str = sv_from_match (matches[1]); - gdb::string_view field_name = sv_from_match (matches[3]); - gdb::string_view pos_begin_str = sv_from_match (matches[4]); + std::string_view field_type_str = sv_from_match (matches[1]); + std::string_view field_name = sv_from_match (matches[3]); + std::string_view pos_begin_str = sv_from_match (matches[4]); ULONGEST pos_begin = try_strtoulst (pos_begin_str); if (field_type_str == "bool") @@ -452,7 +452,7 @@ parse_amd_dbgapi_register_type_flags_fields if (matches[5].rm_so == -1) error (_("Missing end bit position")); - gdb::string_view pos_end_str = sv_from_match (matches[5]); + std::string_view pos_end_str = sv_from_match (matches[5]); ULONGEST pos_end = try_strtoulst (pos_end_str.substr (1)); const amd_dbgapi_register_type &field_type = parse_amd_dbgapi_register_type (field_type_str, type_map); @@ -467,7 +467,7 @@ parse_amd_dbgapi_register_type_flags_fields /* parse_amd_dbgapi_register_type helper for scalars. */ static const amd_dbgapi_register_type & -parse_amd_dbgapi_register_type_scalar (gdb::string_view name, +parse_amd_dbgapi_register_type_scalar (std::string_view name, amd_dbgapi_register_type_map &type_map) { std::string name_str = gdb::to_string (name); @@ -513,24 +513,24 @@ parse_amd_dbgapi_register_type_scalar (gdb::string_view name, details about the format. */ static const amd_dbgapi_register_type & -parse_amd_dbgapi_register_type (gdb::string_view type_str, +parse_amd_dbgapi_register_type (std::string_view type_str, amd_dbgapi_register_type_map &type_map) { size_t pos_open_bracket = type_str.find_last_of ('['); auto sv_from_match = [type_str] (const regmatch_t &m) { return type_str.substr (m.rm_so, m.rm_eo - m.rm_so); }; - if (pos_open_bracket != gdb::string_view::npos) + if (pos_open_bracket != std::string_view::npos) { /* Vector types. */ - gdb::string_view element_type_str + std::string_view element_type_str = type_str.substr (0, pos_open_bracket); const amd_dbgapi_register_type &element_type = parse_amd_dbgapi_register_type (element_type_str, type_map); size_t pos_close_bracket = type_str.find_last_of (']'); - gdb_assert (pos_close_bracket != gdb::string_view::npos); - gdb::string_view count_str_view + gdb_assert (pos_close_bracket != std::string_view::npos); + std::string_view count_str_view = type_str.substr (pos_open_bracket + 1, pos_close_bracket - pos_open_bracket); std::string count_str = gdb::to_string (count_str_view); @@ -567,9 +567,9 @@ parse_amd_dbgapi_register_type (gdb::string_view type_str, if (res == REG_NOMATCH) error (_("Failed to parse flags type string")); - gdb::string_view flags_keyword = sv_from_match (matches[1]); + std::string_view flags_keyword = sv_from_match (matches[1]); unsigned int bit_size = flags_keyword == "flags32_t" ? 32 : 64; - gdb::string_view name = sv_from_match (matches[2]); + std::string_view name = sv_from_match (matches[2]); std::string lookup_name = amd_dbgapi_register_type_flags::make_lookup_name (bit_size, name); auto existing_type_it = type_map.find (lookup_name); @@ -596,7 +596,7 @@ parse_amd_dbgapi_register_type (gdb::string_view type_str, amd_dbgapi_register_type_flags_up flags_type (new amd_dbgapi_register_type_flags (bit_size, name)); - gdb::string_view fields_without_braces = sv_from_match (matches[4]); + std::string_view fields_without_braces = sv_from_match (matches[4]); parse_amd_dbgapi_register_type_flags_fields (*flags_type, bit_size, name, fields_without_braces, type_map); @@ -620,7 +620,7 @@ parse_amd_dbgapi_register_type (gdb::string_view type_str, if (res == REG_NOMATCH) error (_("Failed to parse flags type string")); - gdb::string_view name = sv_from_match (matches[1]); + std::string_view name = sv_from_match (matches[1]); std::string lookup_name = amd_dbgapi_register_type_enum::make_lookup_name (name); @@ -648,7 +648,7 @@ parse_amd_dbgapi_register_type (gdb::string_view type_str, amd_dbgapi_register_type_enum_up enum_type (new amd_dbgapi_register_type_enum (name)); - gdb::string_view fields_without_braces = sv_from_match (matches[3]); + std::string_view fields_without_braces = sv_from_match (matches[3]); parse_amd_dbgapi_register_type_enum_fields (*enum_type, fields_without_braces); diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 8ec5689ebcf..b355a6dc81e 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -35,7 +35,7 @@ #include "extension.h" #include "interps.h" #include "compile/compile.h" -#include "gdbsupport/gdb_string_view.h" +#include #include "python/python.h" #include "guile/guile.h" @@ -103,7 +103,7 @@ class user_args std::string m_command_line; /* The arguments. Each element points inside M_COMMAND_LINE. */ - std::vector m_args; + std::vector m_args; }; /* The stack of arguments passed to user defined functions. We need a diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 3afafa77fb4..b92193bdadd 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -1483,7 +1483,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, { case 'S': if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_STATIC, data_sect_index, psymbol_placement::STATIC, @@ -1500,7 +1500,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, /* The addresses in these entries are reported to be wrong. See the code that reads 'G's for symtabs. */ if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_STATIC, data_sect_index, psymbol_placement::GLOBAL, @@ -1525,7 +1525,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, && namestring[0] != ' ')) { if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), + pst->add_psymbol (std::string_view (sym_name, sym_len), true, STRUCT_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -1540,7 +1540,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, { /* Also a typedef with the same name. */ if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -1559,7 +1559,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, if (p != namestring) /* a name is there, not just :T... */ { if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -1627,7 +1627,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, /* Note that the value doesn't matter for enum constants in psymtabs, just in symtabs. */ if (pst != nullptr) - pst->add_psymbol (gdb::string_view (p, q - p), true, + pst->add_psymbol (std::string_view (p, q - p), true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -1652,7 +1652,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, case 'c': /* Constant, e.g. from "const" in Pascal. */ if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -1712,7 +1712,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, textlow_not_set = 0; } if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), psymbol_placement::STATIC, @@ -1771,7 +1771,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, textlow_not_set = 0; } if (pst != nullptr) - pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + pst->add_psymbol (std::string_view (sym_name, sym_len), true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), psymbol_placement::GLOBAL, diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c index 1ebd98ca705..0e202ff5d96 100644 --- a/gdb/debuginfod-support.c +++ b/gdb/debuginfod-support.c @@ -246,11 +246,11 @@ debuginfod_is_enabled () gdb_printf (_("\nThis GDB supports auto-downloading debuginfo " \ "from the following URLs:\n")); - gdb::string_view url_view (urls); + std::string_view url_view (urls); while (true) { size_t off = url_view.find_first_not_of (' '); - if (off == gdb::string_view::npos) + if (off == std::string_view::npos) break; url_view = url_view.substr (off); /* g++ 11.2.1 on s390x, g++ 11.3.1 on ppc64le and g++ 11 on @@ -266,7 +266,7 @@ debuginfod_is_enabled () styled_string (file_name_style.style (), gdb::to_string (url_view.substr (0, off)).c_str ())); - if (off == gdb::string_view::npos) + if (off == std::string_view::npos) break; url_view = url_view.substr (off); } diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index 58ea541a5c9..7c4af3a1681 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -266,9 +266,9 @@ cooked_index_shard::handle_gnat_encoded_entry (cooked_index_entry *entry, std::string canonical = ada_decode (entry->name, false, false); if (canonical.empty ()) return {}; - std::vector names = split_name (canonical.c_str (), + std::vector names = split_name (canonical.c_str (), split_style::DOT_STYLE); - gdb::string_view tail = names.back (); + std::string_view tail = names.back (); names.pop_back (); const cooked_index_entry *parent = nullptr; @@ -333,7 +333,7 @@ cooked_index_shard::do_finalize () auto eq_entry = [] (const void *a, const void *b) -> int { const cooked_index_entry *ae = (const cooked_index_entry *) a; - const gdb::string_view *sv = (const gdb::string_view *) b; + const std::string_view *sv = (const std::string_view *) b; return (strlen (ae->canonical) == sv->length () && strncasecmp (ae->canonical, sv->data (), sv->length ()) == 0); }; diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index 5aacb321c91..5675ea68bb8 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -25,7 +25,7 @@ #include "symtab.h" #include "hashtab.h" #include "dwarf2/index-common.h" -#include "gdbsupport/gdb_string_view.h" +#include #include "quick-symbol.h" #include "gdbsupport/gdb_obstack.h" #include "addrmap.h" diff --git a/gdb/dwarf2/index-common.c b/gdb/dwarf2/index-common.c index 07330a86da1..04b04f93a61 100644 --- a/gdb/dwarf2/index-common.c +++ b/gdb/dwarf2/index-common.c @@ -58,7 +58,7 @@ dwarf5_djb_hash (const char *str_) /* See dwarf-index-common.h. */ uint32_t -dwarf5_djb_hash (gdb::string_view str) +dwarf5_djb_hash (std::string_view str) { /* Note: tolower here ignores UTF-8, which isn't fully compliant. See http://dwarfstd.org/ShowIssue.php?issue=161027.1. */ diff --git a/gdb/dwarf2/index-common.h b/gdb/dwarf2/index-common.h index 23e814a240b..79d3a59220e 100644 --- a/gdb/dwarf2/index-common.h +++ b/gdb/dwarf2/index-common.h @@ -54,6 +54,6 @@ uint32_t dwarf5_djb_hash (const char *str_); /* Symbol name hashing function as specified by DWARF-5. */ -uint32_t dwarf5_djb_hash (gdb::string_view str_); +uint32_t dwarf5_djb_hash (std::string_view str_); #endif /* DWARF_INDEX_COMMON_H */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e40353975c1..1846f7160cc 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -16884,7 +16884,7 @@ cooked_index_functions::expand_symtabs_matching for (enum language lang : unique_styles) { - std::vector name_vec + std::vector name_vec = lookup_name_without_params.split_name (lang); std::string last_name = gdb::to_string (name_vec.back ()); diff --git a/gdb/elfread.c b/gdb/elfread.c index 7900dfbc388..e153dfcedd3 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -46,7 +46,7 @@ #include "auxv.h" #include "mdebugread.h" #include "ctfread.h" -#include "gdbsupport/gdb_string_view.h" +#include #include "gdbsupport/scoped_fd.h" #include "debuginfod-support.h" #include "dwarf2/public.h" @@ -197,7 +197,7 @@ elf_locate_sections (asection *sectp, struct elfinfo *ei) static struct minimal_symbol * record_minimal_symbol (minimal_symbol_reader &reader, - gdb::string_view name, bool copy_name, + std::string_view name, bool copy_name, unrelocated_addr address, enum minimal_symbol_type ms_type, asection *bfd_section, struct objfile *objfile) @@ -505,7 +505,7 @@ elf_symtab_read (minimal_symbol_reader &reader, && !is_plt && (elf_sym->version & VERSYM_HIDDEN) == 0) record_minimal_symbol (reader, - gdb::string_view (sym->name, len), + std::string_view (sym->name, len), true, unrelocated_addr (symaddr), ms_type, sym->section, objfile); else if (is_plt) @@ -519,7 +519,7 @@ elf_symtab_read (minimal_symbol_reader &reader, struct minimal_symbol *mtramp; mtramp = record_minimal_symbol - (reader, gdb::string_view (sym->name, len), true, + (reader, std::string_view (sym->name, len), true, unrelocated_addr (symaddr), mst_solib_trampoline, sym->section, objfile); if (mtramp) diff --git a/gdb/language.c b/gdb/language.c index c768971be42..cfd4a621e6b 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -641,7 +641,7 @@ default_symbol_name_matcher (const char *symbol_search_name, const lookup_name_info &lookup_name, completion_match_result *comp_match_res) { - gdb::string_view name = lookup_name.name (); + std::string_view name = lookup_name.name (); completion_match_for_lcd *match_for_lcd = (comp_match_res != NULL ? &comp_match_res->match_for_lcd : NULL); strncmp_iw_mode mode = (lookup_name.completion_mode () diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 6dcc56cd562..c71f5a6dcd3 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -457,13 +457,13 @@ struct mapping { ULONGEST addr; ULONGEST endaddr; - gdb::string_view permissions; + std::string_view permissions; ULONGEST offset; - gdb::string_view device; + std::string_view device; ULONGEST inode; /* This field is guaranteed to be NULL-terminated, hence it is not a - gdb::string_view. */ + std::string_view. */ const char *filename; }; @@ -1384,7 +1384,7 @@ parse_smaps_data (const char *data, /* Decode permissions. */ auto has_perm = [&m] (char c) - { return m.permissions.find (c) != gdb::string_view::npos; }; + { return m.permissions.find (c) != std::string_view::npos; }; read = has_perm ('r'); write = has_perm ('w'); exec = has_perm ('x'); diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index cd6638224e7..fc731605991 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -3050,7 +3050,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, switch (p[1]) { case 'S': - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_STATIC, SECT_OFF_DATA (objfile), @@ -3063,7 +3063,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* The addresses in these entries are reported to be wrong. See the code that reads 'G's for symtabs. */ - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_STATIC, SECT_OFF_DATA (objfile), @@ -3085,7 +3085,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, && namestring[0] != ' ')) { pst->add_psymbol - (gdb::string_view (namestring, p - namestring), + (std::string_view (namestring, p - namestring), true, STRUCT_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -3095,7 +3095,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, { /* Also a typedef with the same name. */ pst->add_psymbol - (gdb::string_view (namestring, + (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, @@ -3111,7 +3111,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, just :T... */ { pst->add_psymbol - (gdb::string_view (namestring, + (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, @@ -3178,7 +3178,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* Note that the value doesn't matter for enum constants in psymtabs, just in symtabs. */ - pst->add_psymbol (gdb::string_view (p, + pst->add_psymbol (std::string_view (p, q - p), true, VAR_DOMAIN, LOC_CONST, -1, @@ -3199,7 +3199,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, continue; case 'c': /* Constant, e.g. from "const" in Pascal. */ - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, @@ -3215,7 +3215,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, function_outside_compilation_unit_complaint (copy.c_str ()); } - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), @@ -3236,7 +3236,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, function_outside_compilation_unit_complaint (copy.c_str ()); } - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), diff --git a/gdb/minsyms.c b/gdb/minsyms.c index 1d778822858..72e500be959 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -1170,7 +1170,7 @@ mst_str (minimal_symbol_type t) /* See minsyms.h. */ struct minimal_symbol * -minimal_symbol_reader::record_full (gdb::string_view name, +minimal_symbol_reader::record_full (std::string_view name, bool copy_name, unrelocated_addr address, enum minimal_symbol_type ms_type, int section) @@ -1510,7 +1510,7 @@ minimal_symbol_reader::install () { size_t idx = msym - msymbols; msym->compute_and_set_names - (gdb::string_view (msym->linkage_name (), + (std::string_view (msym->linkage_name (), hash_values[idx].name_length), false, m_objfile->per_bfd, diff --git a/gdb/minsyms.h b/gdb/minsyms.h index f3a2474c796..ee415c4db41 100644 --- a/gdb/minsyms.h +++ b/gdb/minsyms.h @@ -118,7 +118,7 @@ class minimal_symbol_reader SECTION - the symbol's section */ - struct minimal_symbol *record_full (gdb::string_view name, + struct minimal_symbol *record_full (std::string_view name, bool copy_name, unrelocated_addr address, enum minimal_symbol_type ms_type, diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 484d4eaa651..d4cd5810c20 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1208,7 +1208,7 @@ partial_symtab::add_psymbol (const partial_symbol &psymbol, /* See psymtab.h. */ void -partial_symtab::add_psymbol (gdb::string_view name, bool copy_name, +partial_symtab::add_psymbol (std::string_view name, bool copy_name, domain_enum domain, enum address_class theclass, short section, diff --git a/gdb/psymtab.h b/gdb/psymtab.h index 4bafc6e998e..005a63cbba8 100644 --- a/gdb/psymtab.h +++ b/gdb/psymtab.h @@ -21,7 +21,7 @@ #define PSYMTAB_H #include "objfiles.h" -#include "gdbsupport/gdb_string_view.h" +#include #include "gdbsupport/gdb_obstack.h" #include "symfile.h" #include "gdbsupport/next-iterator.h" @@ -346,7 +346,7 @@ struct partial_symtab LANGUAGE is the language from which the symbol originates. This will influence, amongst other things, how the symbol name is demangled. */ - void add_psymbol (gdb::string_view name, + void add_psymbol (std::string_view name, bool copy_name, domain_enum domain, enum address_class theclass, short section, diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index b24d0e8fb23..27cefb9604b 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -451,8 +451,8 @@ rocm_code_object_stream_memory::read (bfd *, void *buf, file_ptr size, static gdb_bfd_iovec_base * rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) { - gdb::string_view uri (bfd_get_filename (abfd)); - gdb::string_view protocol_delim = "://"; + std::string_view uri (bfd_get_filename (abfd)); + std::string_view protocol_delim = "://"; size_t protocol_end = uri.find (protocol_delim); std::string protocol = gdb::to_string (uri.substr (0, protocol_end)); protocol_end += protocol_delim.length (); @@ -460,7 +460,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) std::transform (protocol.begin (), protocol.end (), protocol.begin (), [] (unsigned char c) { return std::tolower (c); }); - gdb::string_view path; + std::string_view path; size_t path_end = uri.find_first_of ("#?", protocol_end); if (path_end != std::string::npos) path = uri.substr (protocol_end, path_end++ - protocol_end); @@ -476,7 +476,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) && std::isxdigit (path[i + 1]) && std::isxdigit (path[i + 2])) { - gdb::string_view hex_digits = path.substr (i + 1, 2); + std::string_view hex_digits = path.substr (i + 1, 2); decoded_path += std::stoi (gdb::to_string (hex_digits), 0, 16); i += 2; } @@ -484,7 +484,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) decoded_path += path[i]; /* Tokenize the query/fragment. */ - std::vector tokens; + std::vector tokens; size_t pos, last = path_end; while ((pos = uri.find ('&', last)) != std::string::npos) { @@ -496,15 +496,15 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) tokens.emplace_back (uri.substr (last)); /* Create a tag-value map from the tokenized query/fragment. */ - std::unordered_map params; - for (gdb::string_view token : tokens) + for (std::string_view token : tokens) { size_t delim = token.find ('='); if (delim != std::string::npos) { - gdb::string_view tag = token.substr (0, delim); - gdb::string_view val = token.substr (delim + 1); + std::string_view tag = token.substr (0, delim); + std::string_view val = token.substr (delim + 1); params.emplace (tag, val); } } @@ -514,7 +514,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) ULONGEST offset = 0; ULONGEST size = 0; - auto try_strtoulst = [] (gdb::string_view v) + auto try_strtoulst = [] (std::string_view v) { errno = 0; ULONGEST value = strtoulst (v.data (), nullptr, 0); diff --git a/gdb/split-name.c b/gdb/split-name.c index 0253b3cf675..0805cb82700 100644 --- a/gdb/split-name.c +++ b/gdb/split-name.c @@ -23,10 +23,10 @@ /* See split-name.h. */ -std::vector +std::vector split_name (const char *name, split_style style) { - std::vector result; + std::vector result; unsigned int previous_len = 0; switch (style) diff --git a/gdb/split-name.h b/gdb/split-name.h index 7648cf9b900..ad2862e222d 100644 --- a/gdb/split-name.h +++ b/gdb/split-name.h @@ -20,7 +20,7 @@ #ifndef GDB_SPLIT_NAME_H #define GDB_SPLIT_NAME_H -#include "gdbsupport/gdb_string_view.h" +#include /* The available styles of name splitting. */ @@ -40,7 +40,7 @@ enum class split_style /* Split NAME into components at module boundaries. STYLE indicates which style of splitting to use. */ -extern std::vector split_name (const char *name, +extern std::vector split_name (const char *name, split_style style); #endif /* GDB_SPLIT_NAME_H */ diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 7402a26a401..4011475f7ac 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -748,7 +748,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, if (new_name != nullptr) sym->compute_and_set_names (new_name.get (), true, objfile->per_bfd); else - sym->compute_and_set_names (gdb::string_view (string, p - string), true, + sym->compute_and_set_names (std::string_view (string, p - string), true, objfile->per_bfd); if (sym->language () == language_cplus) diff --git a/gdb/symtab.c b/gdb/symtab.c index 7f67159b516..408f8041bf0 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -70,7 +70,7 @@ #include "filename-seen-cache.h" #include "arch-utils.h" #include -#include "gdbsupport/gdb_string_view.h" +#include #include "gdbsupport/pathstuff.h" #include "gdbsupport/common-utils.h" @@ -828,10 +828,10 @@ general_symbol_info::set_language (enum language language, /* Objects of this type are stored in the demangled name hash table. */ struct demangled_name_entry { - demangled_name_entry (gdb::string_view mangled_name) + demangled_name_entry (std::string_view mangled_name) : mangled (mangled_name) {} - gdb::string_view mangled; + std::string_view mangled; enum language language; gdb::unique_xmalloc_ptr demangled; }; @@ -940,7 +940,7 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol, so the pointer can be discarded after calling this function. */ void -general_symbol_info::compute_and_set_names (gdb::string_view linkage_name, +general_symbol_info::compute_and_set_names (std::string_view linkage_name, bool copy_name, objfile_per_bfd_storage *per_bfd, std::optional hash) @@ -991,14 +991,14 @@ general_symbol_info::compute_and_set_names (gdb::string_view linkage_name, /* A 0-terminated copy of the linkage name. Callers must set COPY_NAME to true if the string might not be nullterminated. We have to make this copy because demangling needs a nullterminated string. */ - gdb::string_view linkage_name_copy; + std::string_view linkage_name_copy; if (copy_name) { char *alloc_name = (char *) alloca (linkage_name.length () + 1); memcpy (alloc_name, linkage_name.data (), linkage_name.length ()); alloc_name[linkage_name.length ()] = '\0'; - linkage_name_copy = gdb::string_view (alloc_name, + linkage_name_copy = std::string_view (alloc_name, linkage_name.length ()); } else @@ -1038,7 +1038,7 @@ general_symbol_info::compute_and_set_names (gdb::string_view linkage_name, memcpy (mangled_ptr, linkage_name.data (), linkage_name.length ()); mangled_ptr [linkage_name.length ()] = '\0'; new (*slot) demangled_name_entry - (gdb::string_view (mangled_ptr, linkage_name.length ())); + (std::string_view (mangled_ptr, linkage_name.length ())); } (*slot)->demangled = std::move (demangled_name); (*slot)->language = language (); diff --git a/gdb/symtab.h b/gdb/symtab.h index d61d5bb7815..52fd9e23e6c 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -31,7 +31,7 @@ #include "gdbsupport/enum-flags.h" #include "gdbsupport/function-view.h" #include -#include "gdbsupport/gdb_string_view.h" +#include #include "gdbsupport/next-iterator.h" #include "gdbsupport/iterator-range.h" #include "completer.h" @@ -126,11 +126,11 @@ class ada_lookup_name_info final /* A wrapper for ::split_name that handles some Ada-specific peculiarities. */ - std::vector split_name () const + std::vector split_name () const { if (m_verbatim_p || m_standard_p) { - std::vector result; + std::vector result; if (m_standard_p) result.emplace_back ("standard"); result.emplace_back (m_encoded_name); @@ -238,7 +238,7 @@ class lookup_name_info final /* Getters. See description of each corresponding field. */ symbol_name_match_type match_type () const { return m_match_type; } bool completion_mode () const { return m_completion_mode; } - gdb::string_view name () const { return m_name; } + std::string_view name () const { return m_name; } const bool ignore_parameters () const { return m_ignore_parameters; } /* Like the "name" method but guarantees that the returned string is @@ -292,7 +292,7 @@ class lookup_name_info final /* A wrapper for ::split_name (see split-name.h) that splits this name, and that handles any language-specific peculiarities. */ - std::vector split_name (language lang) const + std::vector split_name (language lang) const { if (lang == language_ada) return ada ().split_name (); @@ -356,7 +356,7 @@ class lookup_name_info final symbol_name_match_type m_match_type; bool m_completion_mode; bool m_ignore_parameters; - gdb::string_view m_name; + std::string_view m_name; /* Language-specific info. These fields are filled lazily the first time a lookup is done in the corresponding language. They're @@ -509,7 +509,7 @@ struct general_symbol_info /* Set the linkage and natural names of a symbol, by demangling the linkage name. If linkage_name may not be nullterminated, copy_name must be set to true. */ - void compute_and_set_names (gdb::string_view linkage_name, bool copy_name, + void compute_and_set_names (std::string_view linkage_name, bool copy_name, struct objfile_per_bfd_storage *per_bfd, std::optional hash = std::optional ()); diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index b8954af36e2..83218dc4797 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -1197,7 +1197,7 @@ tui_getc_1 (FILE *fp) Compare keyname instead. */ if (ch >= KEY_MAX) { - auto name = gdb::string_view (keyname (ch)); + auto name = std::string_view (keyname (ch)); /* The following sequences are hardcoded in readline as well. */ diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index a0a123340e3..9219c1f0184 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -54,7 +54,7 @@ #include "gdb_curses.h" #include #include "readline/readline.h" -#include "gdbsupport/gdb_string_view.h" +#include #include @@ -663,7 +663,7 @@ tui_scroll_right_command (const char *arg, int from_tty) /* Answer the window represented by name. */ static struct tui_win_info * -tui_partial_win_by_name (gdb::string_view name) +tui_partial_win_by_name (std::string_view name) { struct tui_win_info *best = nullptr; @@ -935,7 +935,7 @@ tui_set_win_size (const char *arg, bool set_width_p) buf_ptr = skip_to_space (buf_ptr); /* Validate the window name. */ - gdb::string_view wname (buf, buf_ptr - buf); + std::string_view wname (buf, buf_ptr - buf); win_info = tui_partial_win_by_name (wname); if (win_info == NULL) diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index e6ecf2a6de5..829fc1f09c7 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -2500,7 +2500,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, switch (p[1]) { case 'S': - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_STATIC, SECT_OFF_DATA (objfile), @@ -2513,7 +2513,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, case 'G': /* The addresses in these entries are reported to be wrong. See the code that reads 'G's for symtabs. */ - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_STATIC, SECT_OFF_DATA (objfile), @@ -2534,7 +2534,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, || (p == namestring + 1 && namestring[0] != ' ')) { - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, STRUCT_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, @@ -2544,7 +2544,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, if (p[2] == 't') { /* Also a typedef with the same name. */ - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, @@ -2559,7 +2559,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, case 't': if (p != namestring) /* a name is there, not just :T... */ { - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, @@ -2624,7 +2624,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, ; /* Note that the value doesn't matter for enum constants in psymtabs, just in symtabs. */ - pst->add_psymbol (gdb::string_view (p, q - p), true, + pst->add_psymbol (std::string_view (p, q - p), true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, unrelocated_addr (0), @@ -2644,7 +2644,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, case 'c': /* Constant, e.g. from "const" in Pascal. */ - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, @@ -2659,7 +2659,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, std::string name (namestring, (p - namestring)); function_outside_compilation_unit_complaint (name.c_str ()); } - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), @@ -2686,7 +2686,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, if (startswith (namestring, "@FIX")) continue; - pst->add_psymbol (gdb::string_view (namestring, + pst->add_psymbol (std::string_view (namestring, p - namestring), true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h index 4ceb44d88b8..1efc5bbf459 100644 --- a/gdbsupport/common-utils.h +++ b/gdbsupport/common-utils.h @@ -26,7 +26,7 @@ #include "gdbsupport/gdb_unique_ptr.h" #include "gdbsupport/array-view.h" #include "poison.h" -#include "gdb_string_view.h" +#include #if defined HAVE_LIBXXHASH # include @@ -94,7 +94,7 @@ extern const char *safe_strerror (int); true if the start of STRING matches PATTERN, false otherwise. */ static inline bool -startswith (gdb::string_view string, gdb::string_view pattern) +startswith (std::string_view string, std::string_view pattern) { return (string.length () >= pattern.length () && strncmp (string.data (), pattern.data (), pattern.length ()) == 0); @@ -228,7 +228,7 @@ fast_hash (const void *ptr, size_t len, unsigned int start_value = 0) namespace gdb { -/* Hash type for gdb::string_view. +/* Hash type for std::string_view. Even after we switch to C++17 and dump our string_view implementation, we might want to keep this hash implementation if it's faster than std::hash @@ -236,7 +236,7 @@ namespace gdb struct string_view_hash { - std::size_t operator() (gdb::string_view view) const + std::size_t operator() (std::string_view view) const { return fast_hash (view.data (), view.length ()); } }; diff --git a/gdbsupport/format.h b/gdbsupport/format.h index 2af34ab9450..5330bbe361e 100644 --- a/gdbsupport/format.h +++ b/gdbsupport/format.h @@ -20,7 +20,7 @@ #ifndef COMMON_FORMAT_H #define COMMON_FORMAT_H -#include "gdbsupport/gdb_string_view.h" +#include #if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG) # define USE_PRINTF_I64 1 @@ -61,7 +61,7 @@ struct format_piece bool operator== (const format_piece &other) const { return (this->argclass == other.argclass - && gdb::string_view (this->string) == other.string); + && std::string_view (this->string) == other.string); } const char *string; diff --git a/gdbsupport/gdb_string_view.h b/gdbsupport/gdb_string_view.h index 26a3a9f0910..cf7af623327 100644 --- a/gdbsupport/gdb_string_view.h +++ b/gdbsupport/gdb_string_view.h @@ -556,7 +556,7 @@ namespace gdb { namespace gdb { static inline std::string -to_string(const gdb::string_view &view) +to_string(const std::string_view &view) { return { view.data (), view.size () }; }