From patchwork Wed Oct 25 09:24:32 2017 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: 23803 Received: (qmail 66182 invoked by alias); 25 Oct 2017 09:24:43 -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 65675 invoked by uid 89); 25 Oct 2017 09:24:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*MI:google X-HELO: mail-oi0-f74.google.com Received: from mail-oi0-f74.google.com (HELO mail-oi0-f74.google.com) (209.85.218.74) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 25 Oct 2017 09:24:40 +0000 Received: by mail-oi0-f74.google.com with SMTP id w197so24436803oif.23 for ; Wed, 25 Oct 2017 02:24:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=5Hw70UUmqZgp47RVQXOpidWtu0cBE0TZTBq2UIZZbyc=; b=NzD3SURENda87lPZxbZ+8M4fIme7nBxNvkAKvNartkd6YCsWcCN/aC36Wzgk5PV1Iq u7J1K7pE7gAi69G3j/bygiiSem4QV9fscuHQSBF7KsYFBR7p7Z/tklPbL9cWGVT3EmUN kYtjsa1H/6kvpt6dubg2s6/DqnEwCbj9fXuNFElIX9MCqaJeCApJDVN1h698O5mtsBFR HBkkwA2eTLITy3gpjSSmGCIrQ4UVg/umGIsIDv0O9l+hpg4MWlgz337w4Rk9lm3gvZqf 3C22LDELa9hxIfHZbocp2cN1i2MLpQYJEVcNJGUFp13S67cSNsWg1uc7nAW49QXgG+n9 1aPQ== X-Gm-Message-State: AMCzsaV2I42QK1+pealneu3mUaIM2QW5optdxKdG7H2diuJsV3ok+weR EufB42sKReilTUZ0ScD22Df04HlczGyZfBrcgwbBT2kmFpCdsSxZmahob1b1EvfxssCqgMLQEmk FyFKfO+VUKDxOJqINZAwBghQMOaJNJEUC8NH+TSa1NSau706dae/2rFx/rl/bjXpjWodqRw== X-Google-Smtp-Source: ABhQp+RhUQqICQF+FDtpPKSHcoopfIRuLyxV4M1r4UkUGtztqFT6tJxTjRVx9Nwz1kF6I2fMou1wSIi1m78H MIME-Version: 1.0 X-Received: by 10.157.64.180 with SMTP id n49mr782367ote.118.1508923479070; Wed, 25 Oct 2017 02:24:39 -0700 (PDT) Date: Wed, 25 Oct 2017 10:24:32 +0100 Message-Id: <20171025092432.108380-1-leszeks@google.com> Subject: [PATCH] Fix dwarf2_string_attr for -gsplit-dwarf X-Patchwork-Original-From: "Leszek Swirski via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Leszek Swirski To: gdb-patches@sourceware.org Cc: Leszek Swirski The dwarf2_string_attr did not allow DW_FORM_GNU_str_index as a form for string types. This manifested as null strings in the namespace_name lookup (replaced with "(anonymous namespace)") when debugging Fission-compiled code. gdb/ChangeLog: * dwarf2read.c (dwarf2_string_attr): Allow DW_FORM_GNU_strp_alt. (cherry picked from commits 16eb6b2db49e6cf2fdca56efd37689fcc170cd37 and b33404388e5bbd8a1fddfde73cd4593ae2b557e8) --- gdb/ChangeLog | 4 ++++ gdb/dwarf2read.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b77435ce7a..bfa2359a35 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-10-25 Leszek Swirski + + * dwarf2read.c (dwarf2_string_attr): Allow DW_FORM_GNU_str_index. + 2017-10-16 Walfred Tedeschi * features/Makefile (i386-avx-mpx-avx512-pku.dat): Add backslash diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 8503e6171c..93ec587787 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -17577,7 +17577,9 @@ dwarf2_string_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *c if (attr != NULL) { if (attr->form == DW_FORM_strp || attr->form == DW_FORM_line_strp - || attr->form == DW_FORM_string || attr->form == DW_FORM_GNU_strp_alt) + || attr->form == DW_FORM_string + || attr->form == DW_FORM_GNU_str_index + || attr->form == DW_FORM_GNU_strp_alt) str = DW_STRING (attr); else complaint (&symfile_complaints,