From patchwork Fri Oct 13 14:44:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lancelot SIX X-Patchwork-Id: 77664 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 D317738582A4 for ; Fri, 13 Oct 2023 14:45:27 +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-sn1nam02on2084.outbound.protection.outlook.com [40.107.96.84]) by sourceware.org (Postfix) with ESMTPS id E8746385772B for ; Fri, 13 Oct 2023 14:45:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8746385772B 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=Bd8h9J+n8XkNWtsUOo+UMiQwL6eCLXL+lvGCKB8ke54Gosxg3YPWJgXEpGfMBr1suqv8mrcVvmOrRF+MsEBmRAhFtT93QL+RcPWaL5qiC451uBYTJ6b8epCHtF5mzcSyR1H+LnJir9n2PU2ksHFAZm0jEHUe5EziBe5nA88ufleKAVIrOiyz5JnoXWRTIQVhVs/rJGBFHT//miwAteJhyUqzGBiYeJd9PQRasuHP6dxulADLvAOYJov63csA2Xn8WAfZzvntqxW335gbNTkTQO1miI6LiLPyC5sF3kVlg//ZDu5wone+AZ88HIPOJF3xN8TQZpH4BjLDOZymaW+gIw== 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=XnPbv+N8k82+O45WB4aF16C0DR/jN1onhxpSKqmwXu8=; b=AEgh3HwP3opb+uivHAmIeiInqciU+Evg8m2UNAyQBTY/51WyQ7LT0vMr0Lsc05sdAf4uaW19ogcu/KiIWlOmHlPo5s2Yx9DZg5vx63B6k62if2H9cJsOJaVl6zOMyGRlrPmU+Youc1Fw55igb4x1n6+SATdX8NRSGBSzXNnbBhOs/LcjKkWLxtYcOSjZp7PrDlD+MIvgXB9EW9TgtJ+T149qyjy22kKYG/jxB5ROEzf0h5Jvd+ZEPGfa6rqy6XZ0YiPJGua7PI7SAlSG6WCReh1frmmwU7l7UcgU/hxO4fnpU16iKxdJd83mwexki6oufGR/WFl/ySjgt3uWRtF1kw== 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=XnPbv+N8k82+O45WB4aF16C0DR/jN1onhxpSKqmwXu8=; b=oyCS0ZfsktTYUy4D38sOoqDrlq45pSjBntNX0js6zaWHl04H/dOJ4VtDNwzQPWt65iYxM+pPSGYT5hxwHKqhzqy9LCz0AQjmZvXWe7s3Ih/vro9bz86wk619KYqxlEuW3osqGPgT0WEP4S+kTOVOwRgac2364g3MZHW+3FW50G0= Received: from DM6PR11CA0015.namprd11.prod.outlook.com (2603:10b6:5:190::28) by PH0PR12MB7931.namprd12.prod.outlook.com (2603:10b6:510:289::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.44; Fri, 13 Oct 2023 14:44:59 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::ab) by DM6PR11CA0015.outlook.office365.com (2603:10b6:5:190::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.27 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:58 +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 07/11] gdb: Remove uses of gdb::to_string (const std::string_view &) Date: Fri, 13 Oct 2023 14:44:14 +0000 Message-ID: <20231013144418.3180617-8-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_|PH0PR12MB7931:EE_ X-MS-Office365-Filtering-Correlation-Id: 9988dbcb-0e77-4e86-97b6-08dbcbfaf966 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UtI6FbQobh5qQlHoF02a8/vQ+g1igUYuf2atZnM9FjKv0xOt1JqYWPUdvirx44zr0X86eW9g2udM60lY9jepQoRlIh2HMyHJPC2RDqsbZ6TW4oynjz1JX34MGRI3hdpsY6XTvHSSaLM1+9FTF+Pn0Dbkng5eWaKgjd6ju6CjoDYnXv7sUYkkqUkAt72ca3/O1UNo5u6YSaJ9TfqK+fp5dot/dJD3xRgIOgjxQxPk6ZYEh2vcYMNoKh+3621v+0w12VMagmu4A28zZ+jESzuurJofXDQ2fV+cCrxVuRRgCywZqN8rZyYjbN3ki+xtBKhwF+E4S3bUducFHXBbd6Frw/KiV/3CtLAQAV/GV/6ZPc4CET7Cf4FAKtabh7L638vjJsclaGQbeNBD5k1BNKbpc4Fe3dldgFOhl5YP5C7YFoYVc8Cy2iFKdluwyu/kN+DxpaSX74JtUd1eGILtf4WqK/olsWHJhcylSdNYrwMDlMHfgAvyYaf6wOs+g0UaMf8rNx1Sy6D6d9Sc1fUXFZH1NFwYmAy1Ss3vtQqvlxxAAa58PsZnHyADj+/CJECIS1JeqGoDgKIhk4TpXY/0kqK1d0sok4h3DeuDKp4P7ybUMS6ZbvVb6ZmljyHQ+mxYk2XJFizHs9QPwBWSf0+ltNzgwOLB8GvzyyIr2Nkaa3UjP73dyDw/wPWwNPrZLIYTBGaAUmIiVFykYIrG9iheDGU/1B5prdSSC5dZ3Gb8zsKwCQiN/pa0HQ48y0JbLahk7BV4jU2OLoXtdSZ6H1hFh2Vm+Q== 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)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(451199024)(1800799009)(82310400011)(186009)(64100799003)(40470700004)(36840700001)(46966006)(40460700003)(2616005)(26005)(16526019)(316002)(6916009)(70586007)(70206006)(1076003)(82740400003)(356005)(8676002)(36860700001)(8936002)(4326008)(40480700001)(36756003)(336012)(2906002)(426003)(6666004)(7696005)(83380400001)(86362001)(81166007)(478600001)(5660300002)(47076005)(41300700001)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2023 14:44:58.8476 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9988dbcb-0e77-4e86-97b6-08dbcbfaf966 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: PH0PR12MB7931 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 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 This patch removes all uses of to_string(const std::string_view&) and use the std::string ctor or implicit conversion from std::string_view to std::string instead. A later patch will remove this gdb::to_string while removing gdbsupport/gdb_string_view.h. Change-Id: I877cde557a0727be7b0435107e3c7a2aac165895 --- gdb/ada-lang.c | 20 +++++++++----------- gdb/amdgpu-tdep.c | 18 +++++++++--------- gdb/debuginfod-support.c | 3 +-- gdb/dwarf2/read.c | 2 +- gdb/solib-rocm.c | 8 ++++---- 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 3e394619399..ff7222c7eed 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1040,7 +1040,7 @@ ada_fold_name (std::string_view name, bool throw_on_error = false) static std::string fold_storage; if (!name.empty () && name[0] == '\'') - fold_storage = gdb::to_string (name.substr (1, name.size () - 2)); + fold_storage = name.substr (1, name.size () - 2); else { /* Why convert to UTF-32 and implement our own case-folding, @@ -1081,12 +1081,12 @@ ada_fold_name (std::string_view name, bool throw_on_error = false) warned = true; warning (_("could not convert '%s' from the host encoding (%s) to UTF-32.\n" "This normally should not happen, please file a bug report."), - gdb::to_string (name).c_str (), host_charset ()); + std::string (name).c_str (), host_charset ()); } /* We don't try to recover from errors; just return the original string. */ - fold_storage = gdb::to_string (name); + fold_storage = name; return fold_storage.c_str (); } @@ -1135,12 +1135,12 @@ ada_fold_name (std::string_view name, bool throw_on_error = false) warned = true; warning (_("could not convert the lower-cased variant of '%s'\n" "from UTF-32 to the host encoding (%s)."), - gdb::to_string (name).c_str (), host_charset ()); + std::string (name).c_str (), host_charset ()); } /* We don't try to recover from errors; just return the original string. */ - fold_storage = gdb::to_string (name); + fold_storage = name; } } @@ -13255,11 +13255,9 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) if (!user_name.empty () && user_name[0] == '<') { if (user_name.back () == '>') - m_encoded_name - = gdb::to_string (user_name.substr (1, user_name.size () - 2)); + m_encoded_name = user_name.substr (1, user_name.size () - 2); else - m_encoded_name - = gdb::to_string (user_name.substr (1, user_name.size () - 1)); + m_encoded_name = user_name.substr (1, user_name.size () - 1); m_encoded_p = true; m_verbatim_p = true; m_wild_match_p = false; @@ -13276,10 +13274,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) const char *folded = ada_fold_name (user_name); m_encoded_name = ada_encode_1 (folded, false); if (m_encoded_name.empty ()) - m_encoded_name = gdb::to_string (user_name); + m_encoded_name = user_name; } else - m_encoded_name = gdb::to_string (user_name); + m_encoded_name = user_name; /* Handle the 'package Standard' special case. See description of m_standard_p. */ diff --git a/gdb/amdgpu-tdep.c b/gdb/amdgpu-tdep.c index 48dc8db6bcc..15f32885b07 100644 --- a/gdb/amdgpu-tdep.c +++ b/gdb/amdgpu-tdep.c @@ -401,7 +401,7 @@ parse_amd_dbgapi_register_type_enum_fields if (value > std::numeric_limits::max ()) enum_type.set_bit_size (64); - enum_type.add_enumerator (gdb::to_string (name), value); + enum_type.add_enumerator (std::string (name), value); fields = fields.substr (matches[0].rm_eo); } @@ -445,7 +445,7 @@ parse_amd_dbgapi_register_type_flags_fields ULONGEST pos_begin = try_strtoulst (pos_begin_str); if (field_type_str == "bool") - flags_type.add_field (gdb::to_string (field_name), pos_begin, pos_begin, + flags_type.add_field (std::string (field_name), pos_begin, pos_begin, nullptr); else { @@ -456,7 +456,7 @@ parse_amd_dbgapi_register_type_flags_fields 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); - flags_type.add_field (gdb::to_string (field_name), pos_begin, pos_end, + flags_type.add_field (std::string (field_name), pos_begin, pos_end, &field_type); } @@ -470,7 +470,7 @@ static const amd_dbgapi_register_type & 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); + std::string name_str (name); auto it = type_map.find (name_str); if (it != type_map.end ()) { @@ -533,7 +533,7 @@ parse_amd_dbgapi_register_type (std::string_view type_str, 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); + std::string count_str (count_str_view); unsigned int count = std::stoul (count_str); std::string lookup_name @@ -579,7 +579,7 @@ parse_amd_dbgapi_register_type (std::string_view type_str, /* No braces, lookup existing type. */ if (existing_type_it == type_map.end ()) error (_("reference to unknown type %s."), - gdb::to_string (name).c_str ()); + std::string (name).c_str ()); if (existing_type_it->second->kind () != amd_dbgapi_register_type::kind::FLAGS) @@ -592,7 +592,7 @@ parse_amd_dbgapi_register_type (std::string_view type_str, /* With braces, it's a definition. */ if (existing_type_it != type_map.end ()) error (_("re-definition of type %s."), - gdb::to_string (name).c_str ()); + std::string (name).c_str ()); amd_dbgapi_register_type_flags_up flags_type (new amd_dbgapi_register_type_flags (bit_size, name)); @@ -631,7 +631,7 @@ parse_amd_dbgapi_register_type (std::string_view type_str, /* No braces, lookup existing type. */ if (existing_type_it == type_map.end ()) error (_("reference to unknown type %s"), - gdb::to_string (name).c_str ()); + std::string (name).c_str ()); if (existing_type_it->second->kind () != amd_dbgapi_register_type::kind::ENUM) @@ -644,7 +644,7 @@ parse_amd_dbgapi_register_type (std::string_view type_str, /* With braces, it's a definition. */ if (existing_type_it != type_map.end ()) error (_("re-definition of type %s"), - gdb::to_string (name).c_str ()); + std::string (name).c_str ()); amd_dbgapi_register_type_enum_up enum_type (new amd_dbgapi_register_type_enum (name)); diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c index 0e202ff5d96..eb88c406ad6 100644 --- a/gdb/debuginfod-support.c +++ b/gdb/debuginfod-support.c @@ -264,8 +264,7 @@ debuginfod_is_enabled () gdb_printf (_(" <%ps>\n"), styled_string (file_name_style.style (), - gdb::to_string (url_view.substr (0, - off)).c_str ())); + std::string (url_view.substr (0, off)).c_str ())); if (off == std::string_view::npos) break; url_view = url_view.substr (off); diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 1846f7160cc..0973fb6fe13 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -16886,7 +16886,7 @@ cooked_index_functions::expand_symtabs_matching { std::vector name_vec = lookup_name_without_params.split_name (lang); - std::string last_name = gdb::to_string (name_vec.back ()); + std::string last_name (name_vec.back ()); for (const cooked_index_entry *entry : table->find (last_name, completing)) diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 27cefb9604b..c39b5b8bdeb 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -454,7 +454,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) 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)); + std::string protocol (uri.substr (0, protocol_end)); protocol_end += protocol_delim.length (); std::transform (protocol.begin (), protocol.end (), protocol.begin (), @@ -477,7 +477,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) && std::isxdigit (path[i + 2])) { std::string_view hex_digits = path.substr (i + 1, 2); - decoded_path += std::stoi (gdb::to_string (hex_digits), 0, 16); + decoded_path += std::stoi (std::string (hex_digits), 0, 16); i += 2; } else @@ -563,7 +563,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) if (pid != inferior->pid) { warning (_("`%s': code object is from another inferior"), - gdb::to_string (uri).c_str ()); + std::string (uri).c_str ()); bfd_set_error (bfd_error_bad_value); return nullptr; } @@ -580,7 +580,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) } warning (_("`%s': protocol not supported: %s"), - gdb::to_string (uri).c_str (), protocol.c_str ()); + std::string (uri).c_str (), protocol.c_str ()); bfd_set_error (bfd_error_bad_value); return nullptr; }