From patchwork Thu Feb 13 05:39:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 38016 Received: (qmail 117433 invoked by alias); 13 Feb 2020 05:39:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 117425 invoked by uid 89); 13 Feb 2020 05:39:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-pl1-f201.google.com Received: from mail-pl1-f201.google.com (HELO mail-pl1-f201.google.com) (209.85.214.201) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 13 Feb 2020 05:39:30 +0000 Received: by mail-pl1-f201.google.com with SMTP id p19so2543431plr.8 for ; Wed, 12 Feb 2020 21:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=1D34sn/MHw1BY4vU9t7o59IwuB08GzbpcaKNS7ylcJ4=; b=h0FKi0V3yboK21tiL+hDdFaGcZq3UyLQtIY5XzDxZXuL1/OvApJSe0LOjoi567yQjz T/Tfl6Nygug9/9TXOjOjSIKakuK+sdpGulbKPeTFIVSES33IRAwEwzEN/F0lhPGDM8+A bHW7iHJ/kYTkjkZmRdtmHXjTTKD0G8SGcfN4sr/Le4OCNyE/QTk5rEjFicMoTYvFVe9M U7qmuYStFvhYSLTU54a0K30UxPTOZg3S2j6HFgSr9x0Oi/m/YMAyctsJGR6UAIQKnSI9 Ysqrp3y1m6nqXBRYdUMlYQhtHrlbnQtw72x/9h9ZcVgHVIiEAhZU3y9sIG1PoubDAjDo y3ew== Date: Wed, 12 Feb 2020 21:39:20 -0800 Message-Id: <20200213053920.144599-1-tamur@google.com> Mime-Version: 1.0 Subject: [PATCH] Fix off-by-one bug in dwarf 5 file indexes. X-Patchwork-Original-From: "Ali Tamur via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Ali Tamur To: gdb-patches@sourceware.org Cc: Nitika.Achra@amd.com, JiniSusan.George@amd.com, Ali Tamur X-IsSubscribed: yes Fix dw2_get_file_names_reader behavior where it treated file names in line header as one indexed. gdb/ChangeLog: * dwarf2/read.c (dw2_get_file_names_reader): Bug fix. --- gdb/dwarf2/read.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 7edbd9d7df..988d44a714 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -3160,8 +3160,9 @@ dw2_get_file_names_reader (const struct die_reader_specs *reader, XOBNEWVEC (&objfile->objfile_obstack, const char *, qfn->num_file_names); if (offset != 0) qfn->file_names[0] = xstrdup (fnd.name); + int index_offset = lh->version < 5 ? 1 : 0; for (int i = 0; i < lh->file_names_size (); ++i) - qfn->file_names[i + offset] = lh->file_full_name (i + 1, + qfn->file_names[i + offset] = lh->file_full_name (i + index_offset, fnd.comp_dir).release (); qfn->real_names = NULL;