From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id E627E3858C54; Thu, 1 Dec 2022 18:18:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E627E3858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669918721; bh=3R+zGqJjca5KVzv9kok7RmeVcklDuN4iEgNV8sxs6bQ=; h=From:To:Subject:Date:From; b=I90RzH6DAXnajTp3wdBoy7EsG44C6oPXMYPsxzcvGiYZbOSdzRsbkO53YPiwis/0O NhagsqiVSnB0g4YdI4oJKx6WFgwuYHRx1NeJe7ngQi5PAhv13C74w3luCvFr6NVwCI gzVMYqIiYptUlj4hKIsem15xpDBGZcgAcOmZVRwQ= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove language check from dwarf2_compute_name X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 00a5867df72983c3f8a11c9955c5032d6f601b70 X-Git-Newrev: 5f0a4fb85ed3b5fb112ff884a98eb95c685658b0 Message-Id: <20221201181841.E627E3858C54@sourceware.org> Date: Thu, 1 Dec 2022 18:18:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D5f0a4fb85ed3= b5fb112ff884a98eb95c685658b0 commit 5f0a4fb85ed3b5fb112ff884a98eb95c685658b0 Author: Tom Tromey Date: Fri Nov 4 14:08:13 2022 -0600 Remove language check from dwarf2_compute_name =20 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. =20 Reviewed-by: Andrew Burgess Diff: --- 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 dd7fea40027..aa13d42ad77 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -8927,7 +8927,6 @@ dwarf2_compute_name (const char *name, if (die_needs_namespace (die, cu)) { const char *prefix; - const char *canonical_name =3D NULL; =20 string_file buf; =20 @@ -9093,10 +9092,9 @@ dwarf2_compute_name (const char *name, =20 const std::string &intermediate_name =3D buf.string (); =20 - if (lang =3D=3D language_cplus) - canonical_name - =3D dwarf2_canonicalize_name (intermediate_name.c_str (), cu, - objfile); + const char *canonical_name + =3D dwarf2_canonicalize_name (intermediate_name.c_str (), cu, + objfile); =20 /* If we only computed INTERMEDIATE_NAME, or if INTERMEDIATE_NAME is already canonical, then we need to