From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by sourceware.org (Postfix) with ESMTPS id 69C5B3858C2F for ; Mon, 7 Nov 2022 16:24:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 69C5B3858C2F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd29.google.com with SMTP id d123so9263142iof.7 for ; Mon, 07 Nov 2022 08:24:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P0hhcan10dTWPJ5hO6Q9mULCzkxkO38jlIy+QyUiECU=; b=OQSYIHD7gZIYLOiDvbnMiP61xJ9NOfel2ppqY4xH3GIlypvBAdNvOsRQCFr38oCUw7 yiFGacFDOiZOzKjyNYT0Fc+d0V+l17ffcUMxLSiS/3qQx9rQGcpWhAn+ZT75+gDZfC+e wfIYo6A1sZHpCefH0ibH7a5FFFbG93rLUVbJm1t3MMxf352jDAIKjy9q5rCSRnjguLSY 27nvwPJgx2txuLLCWW0CSuzFSflcq1stqLZxCKEuQ/WzuioWFCFSib4EVXswjI5m74Qs Ib2t+6YrWS1s6UKC/tstFbtaPIR9e4o7B7A1YUhU2eWTHHyR5evuaF64nUheFAGjpW4Y Fywg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P0hhcan10dTWPJ5hO6Q9mULCzkxkO38jlIy+QyUiECU=; b=GIG9ukNWlnaGE4WGIYrjU13NZuV4iiTXcuQNXSEjcmpNNYYvWPqOfKlle9sK1lyzgJ 7pZkrTQfRWxkP0gJCIrUGYscapo/oFPLZb1c1LaaHoPxSuxK0cWVwfMPDjy17qrpZ5wy 9vnadD9TrEdysMX0LFL5/qS1tTfQg4audy3U1FYvfCMBpEqU5X8Gv+uVlN++8Qhfwu7n 1Uf8m9esQNogh/57aCuYjtrtP8CyQku/AILqKP3TiF+oxWwauR4yS5SZhysz2nvwId1D uTCWQn7ChVCRFOXqfsRzZuHypoxR1ug7SynnzEqlYJ+JCxQQOXHJgrsJbMnv6yqT/Xo0 VXXA== X-Gm-Message-State: ACrzQf1RCRDuQNSjjlqurmhD35nV5bRCVSr7lZiXT19hYaKLwmjJrLYO dw1AWxUdh8LjRGMLSl239CVp7paSiyYPNw== X-Google-Smtp-Source: AMsMyM5GIgb4hup9qH/tGOKXQe94ZS2XswWx6mCZNiWg6u1dIKIWLXCK21AB06ofhgMgOAcFYQpOrA== X-Received: by 2002:a05:6638:59c:b0:375:4fb8:e417 with SMTP id a28-20020a056638059c00b003754fb8e417mr27835074jar.137.1667838248662; Mon, 07 Nov 2022 08:24:08 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id i12-20020a023b4c000000b003750aa3c5c1sm2790492jaf.31.2022.11.07.08.24.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 08:24:08 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/3] Remove language check from dwarf2_compute_name Date: Mon, 7 Nov 2022 09:23:54 -0700 Message-Id: <20221107162356.3175221-2-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20221107162356.3175221-1-tromey@adacore.com> References: <20221107162356.3175221-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: dwarf2_compute_name has a redundant check of the CU's language -- this is also checked in dwarf2_canonicalize_name. Removing this slightly simplifies a future patch. --- gdb/dwarf2/read.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 60e120a9d76..978dd4d0bb9 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -8918,7 +8918,6 @@ dwarf2_compute_name (const char *name, if (die_needs_namespace (die, cu)) { const char *prefix; - const char *canonical_name = NULL; string_file buf; @@ -9084,10 +9083,9 @@ dwarf2_compute_name (const char *name, const std::string &intermediate_name = buf.string (); - if (lang == language_cplus) - canonical_name - = dwarf2_canonicalize_name (intermediate_name.c_str (), cu, - objfile); + const char *canonical_name + = dwarf2_canonicalize_name (intermediate_name.c_str (), cu, + objfile); /* If we only computed INTERMEDIATE_NAME, or if INTERMEDIATE_NAME is already canonical, then we need to -- 2.34.3