From patchwork Wed Feb 14 15:02:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 85734 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 9D9E03860742 for ; Wed, 14 Feb 2024 15:03:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id E3DAC385C422 for ; Wed, 14 Feb 2024 15:02:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E3DAC385C422 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E3DAC385C422 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707922963; cv=none; b=DIo9RlkzHGROdfrHo4bb4uho8/fucuFnTXyBbA6WyN0c5EvzWa7txuufAJeueBFA0Ve0LgmnShdFaeoNzNp+BpDDmNDRVa0yJAiPg4ao5PmTsNlRAYvVIBTREDx2E5se4y0SPtFiEDlICdid+Y/PCXaShJ8r9WlRaSwPgY6nl2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707922963; c=relaxed/simple; bh=bfq5kVlt7FgQ4bd3lFbyQySn0uIfkuP2R+z5MGB4B1s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=VxFFLyhHS1PyMV1nv2VHtMiWSWb4mDy2f84JqxvZDRptp1fxTEpXZcptu6nBBgpAjR7H4n7/RDrq0Syx+hVI/PkoE3D1uuRPLwtXt1+WZ/EAeXUGsWJIR7SYxYH6UgmZ/K5HBLUY8kie3Iu3UhOk+IN5OTaBOkqVfkJOeXAVkFA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7bed9fb159fso230933339f.1 for ; Wed, 14 Feb 2024 07:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1707922958; x=1708527758; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Rago0zP8tOCf7DNKj+riJ5sblsWNpyzdPsr+BzePP3Y=; b=OW2aBWzxw9tJI1I6PKGA4zS3ttlSSH2cq26KRHYceHJmUaCN27ND2fd7+4YTsttlul kS4ffxTGNHITQwe+CdCnp8K4KG4lpUNDtGwqyvKmS/HpicbulE4tXtvPM1g/sRaLKp/K VhED7X79/5fJmXG0QFMiTB2IwfKX3V5z5m3WBj65jMRUyvlbCPO6m6NqoVvZfv1h27qC ce+OJVMvkm3PCzgf83SYCJqHLoMDwfdZT2uEPkPh0KRwSlLqRsK0HInab7B1PcpxaajC 523ywOkfAjfL0cpSPXljmI9gDLqxJifhQhQvdQ1KR6JkvS8Iy3wHg51QtZ+7IyrIz3U8 rKrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707922958; x=1708527758; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Rago0zP8tOCf7DNKj+riJ5sblsWNpyzdPsr+BzePP3Y=; b=vaUP37layfe1tEhwhf/x/a/mF3I8AVoRqD/m20XeROOP7yxaWZ98+HWFKaLKy9jpTu 3nTVDt20VojLCuDr7NILrvfGW8F6XvNB11+TrAOoaffzljYd+q4GY6bGEfiOqRNM2c3Y 3QOhsTsfq7je08tFIswlKu89pOHbe/iNUIGPw/bRvRVf1OIyvQJCeCRKa8ZAXOaEXGSL UrVV3UcZgXqe+RZYXRUsfn0skDPkF1pkCpdYh3S10I3acLtOXoLjJwFguVktF5EIzffb NyhNNllGZ1MyPva/SAvE0j0J3IdUpx6xIKIbfb5n7rP0Dfe7VNy+Ddv9mPUeinDjDYeI wfQA== X-Gm-Message-State: AOJu0YzS7zGehyEbV4wrHDLjQnyxQOYrAk2XAhFH8zrY3arydL4IyYBt t/7/KOPInnVAq+Ni1oq+HLsnROOduD7WvpftXfzT7IqpEITh2tt0cmOYB7BUKcd9hvwvLfKBUqs = X-Google-Smtp-Source: AGHT+IENwfIi6AbqDWs1mjqWzrEqKanoGhGnw9rSSdL9NcBewUhUnih4Pe/hmANCxaU5XeGiiBufQQ== X-Received: by 2002:a92:c64f:0:b0:363:dfa7:5582 with SMTP id 15-20020a92c64f000000b00363dfa75582mr2854266ill.30.1707922957948; Wed, 14 Feb 2024 07:02:37 -0800 (PST) Received: from localhost.localdomain (71-211-170-195.hlrn.qwest.net. [71.211.170.195]) by smtp.gmail.com with ESMTPSA id br8-20020a056e0223c800b00363ea2d5c3dsm378413ilb.60.2024.02.14.07.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 07:02:37 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Use string_view in quirk_rust_enum Date: Wed, 14 Feb 2024 08:02:27 -0700 Message-ID: <20240214150227.2367977-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 quirk_rust_enum makes string copies to store in an unordered_map. However, the original strings have an appropriate lifetime, and so no copying is needed. With C++17, we can rely on string_view having a std::hash specialization, so this patch changes this code to use string_view rather than string. --- gdb/dwarf2/read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 486be7e4921..f9e80274618 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -5948,7 +5948,7 @@ quirk_rust_enum (struct type *type, struct objfile *objfile) /* We need a way to find the correct discriminant given a variant name. For convenience we build a map here. */ struct type *enum_type = disr_field->type (); - std::unordered_map discriminant_map; + std::unordered_map discriminant_map; for (int i = 0; i < enum_type->num_fields (); ++i) { if (enum_type->field (i).loc_kind () == FIELD_LOC_KIND_ENUMVAL)