From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tromey@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2126)
 id F31A53858002; Wed,  8 Dec 2021 20:07:48 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F31A53858002
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Tom Tromey <tromey@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] Fix error in file_and_directory patch
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom Tromey <tromey@adacore.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 2988a36005f2821cee6744473ad8a3ba7638c212
X-Git-Newrev: 621f8c42d3df079ca5781cdb0925c5ec3498f59c
Message-Id: <20211208200748.F31A53858002@sourceware.org>
Date: Wed,  8 Dec 2021 20:07:48 +0000 (GMT)
X-BeenThere: gdb-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-cvs mailing list <gdb-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-cvs/>
List-Help: <mailto:gdb-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Dec 2021 20:07:49 -0000

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=621f8c42d3df079ca5781cdb0925c5ec3498f59c

commit 621f8c42d3df079ca5781cdb0925c5ec3498f59c
Author: Tom Tromey <tromey@adacore.com>
Date:   Wed Dec 8 12:52:34 2021 -0700

    Fix error in file_and_directory patch
    
    In my earlier C++-ization patch for file_and_directory, I introduced
    an error:
    
    -  if (strcmp (fnd.name, "<unknown>") != 0)
    +  if (fnd.is_unknown ())
    
    This change inverted the sense of the test, which causes failures with
    .debug_names.
    
    This patch fixes the bug.  Regression tested on x86-64 Fedora 34.  I
    also tested it using the AdaCore internal test suite, with
    .debug_names -- this was failing before, and now it works.

Diff:
---
 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 f2d7da7de52..dd2134b3c63 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -3008,7 +3008,7 @@ dw2_get_file_names_reader (const struct die_reader_specs *reader,
   file_and_directory &fnd = find_file_and_directory (comp_unit_die, cu);
 
   int offset = 0;
-  if (fnd.is_unknown ())
+  if (!fnd.is_unknown ())
     ++offset;
   else if (lh == nullptr)
     return;