From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sWAtH0s02WKKpxcAWB0awg (envelope-from ) for ; Thu, 21 Jul 2022 07:11:07 -0400 Received: by simark.ca (Postfix, from userid 112) id 71AF81E5EA; Thu, 21 Jul 2022 07:11:07 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=f2UoGbda; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E30931E222 for ; Thu, 21 Jul 2022 07:11:06 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E722A3856DEB for ; Thu, 21 Jul 2022 11:11:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E722A3856DEB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1658401864; bh=VTx2p4XvTaaDWepZVuchSoEYoDMpRu1mQDVTtmQxfEA=; h=Date:To:References:Subject:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=f2UoGbdaYnKKvxmoxcpkzLIfLHSj1Z+gYSJsI7yzSCUoW3MQNFda3xWZswp4CvcQ2 AnwXcdgobIPaE6L99tNaqxlD3LUUNCgIm4P15QBji3/eW6TRSnepktou50gph7Asfz nn9qpf9CxZRT4prXCgVKopzI5WDUFtIjvnyu92+M= Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 55C633856DE4 for ; Thu, 21 Jul 2022 11:10:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55C633856DE4 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 78F601F895; Thu, 21 Jul 2022 11:10:24 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 63AFF13A1B; Thu, 21 Jul 2022 11:10:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IkcuFyA02WKyZgAAMHmgww (envelope-from ); Thu, 21 Jul 2022 11:10:24 +0000 Content-Type: multipart/mixed; boundary="------------wX9RBvzCkG0PBCiHXPaoPDw1" Message-ID: <3b04b910-f020-7dba-54cd-46e23eb9657c@suse.de> Date: Thu, 21 Jul 2022 13:10:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Content-Language: en-US To: gdb-patches@sourceware.org References: <20220714144351.GA31826@delia.home> Subject: [committed][gdb/symtab] Fix bad compile unit index complaint In-Reply-To: <20220714144351.GA31826@delia.home> X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Cc: Tom Tromey Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" This is a multi-part message in MIME format. --------------wX9RBvzCkG0PBCiHXPaoPDw1 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit [ was: Re: [PATCH][gdb/symtab] Force usage of all_comp_units.size (CU/TU/CUTU) ] On 7/14/22 16:43, Tom de Vries wrote: > Hi, > > I noticed this code in dw2_debug_names_iterator::next: > ... > case DW_IDX_compile_unit: > /* Don't crash on bad data. */ > if (ull >= per_bfd->all_comp_units.size ()) > { > complaint (_(".debug_names entry has bad CU index %s" > " [in module %s]"), > pulongest (ull), > objfile_name (objfile)); > continue; > } > per_cu = per_bfd->get_cu (ull); > break; > ... > > This code used to DTRT, before we started keeping both CUs and TUs in > all_comp_units. > I've dropped the all_comp_units.size (CU/TU/CUTU) part, since that somewhat violates the One-Patch-Per-Independent=Change rule. That also makes the patch trivial, so committed as attached. Thanks, - Tom --------------wX9RBvzCkG0PBCiHXPaoPDw1 Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-symtab-Fix-bad-compile-unit-index-complaint.patch" Content-Disposition: attachment; filename*0="0001-gdb-symtab-Fix-bad-compile-unit-index-complaint.patch" Content-Transfer-Encoding: base64 W2dkYi9zeW10YWJdIEZpeCBiYWQgY29tcGlsZSB1bml0IGluZGV4IGNvbXBsYWludAoKSSBu b3RpY2VkIHRoaXMgY29kZSBpbiBkdzJfZGVidWdfbmFtZXNfaXRlcmF0b3I6Om5leHQ6Ci4u LgogICAgICAgIGNhc2UgRFdfSURYX2NvbXBpbGVfdW5pdDoKICAgICAgICAgIC8qIERvbid0 IGNyYXNoIG9uIGJhZCBkYXRhLiAgKi8KICAgICAgICAgIGlmICh1bGwgPj0gcGVyX2JmZC0+ YWxsX2NvbXBfdW5pdHMuc2l6ZSAoKSkKICAgICAgICAgICAgewogICAgICAgICAgICAgIGNv bXBsYWludCAoXygiLmRlYnVnX25hbWVzIGVudHJ5IGhhcyBiYWQgQ1UgaW5kZXggJXMiCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICIgW2luIG1vZHVsZSAlc10iKSwKICAgICAgICAg ICAgICAgICAgICAgICAgIHB1bG9uZ2VzdCAodWxsKSwKICAgICAgICAgICAgICAgICAgICAg ICAgIG9iamZpbGVfbmFtZSAob2JqZmlsZSkpOwogICAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICAgICB9CiAgICAgICAgICBwZXJfY3UgPSBwZXJfYmZkLT5nZXRfY3UgKHVsbCk7 CiAgICAgICAgICBicmVhazsKLi4uCgpUaGlzIGNvZGUgdXNlZCB0byBEVFJULCBiZWZvcmUg d2Ugc3RhcnRlZCBrZWVwaW5nIGJvdGggQ1VzIGFuZCBUVXMgaW4KYWxsX2NvbXBfdW5pdHMu CgpGaXggYnkgdXNpbmcgInBlcl9iZmQtPmFsbF9jb21wX3VuaXRzLnNpemUgKCkgLSBwZXJf YmZkLT50dV9zdGF0cy5ucl90dXMiCmluc3RlYWQuCgpJdCdzIGhhcmQgdG8gcHJvZHVjZSBh IHRlc3QtY2FzZSBmb3IgdGhpcywgYnV0IGxldCdzIHRyeSBhdCBsZWFzdCB0byB0cmlnZ2Vy CnRoZSBjb21wbGFpbnQgc29tZWhvdy4gIFdlIHN0YXJ0IG91dCBieSBjcmVhdGluZyBhbiBl eGVjIHdpdGggLmRlYnVnX3R5cGVzIGFuZAouZGVidWdfbmFtZXM6Ci4uLgokIGdjYyAtZyB+ L2hlbGxvLmMgLWZkZWJ1Zy10eXBlcy1zZWN0aW9uCiQgZ2RiLWFkZC1pbmRleCAtZHdhcmYt NSBhLm91dAouLi4KYW5kIHZlcmlmeSB0aGF0IHdlIGRvbid0IHNlZSBhbnkgY29tcGxhaW50 czoKLi4uCiQgZ2RiIC1xIC1iYXRjaCAtaWV4ICJzZXQgY29tcGxhaW50cyAxMDAiIC4vYS5v dXQKLi4uCgpXZSBsb29rIGF0IHRoZSBDVSBhbmQgVFUgdGFibGUgdXNpbmcgcmVhZGVsZiAt dyBhbmQgY29uY2x1ZGUgdGhhdCB3ZSBoYXZlCm5yX2N1cyA9PSA2IGFuZCBucl90dXMgPT0g MS4KCk5vdyBvdmVycmlkZSB1bGwgaW4gZHcyX2RlYnVnX25hbWVzX2l0ZXJhdG9yOjpuZXh0 IGZvciB0aGUgRFdfSURYX2NvbXBpbGVfdW5pdApjYXNlIHRvIDYsIGFuZCB3ZSBoYXZlOgou Li4KJCBnZGIgLXEgLWJhdGNoIC1pZXggInNldCBjb21wbGFpbnRzIDEwMCIgLi9hLm91dApE dXJpbmcgc3ltYm9sIHJlYWRpbmc6IC5kZWJ1Z19uYW1lcyBlbnRyeSBoYXMgYmFkIENVIGlu ZGV4IDYgW2luIG1vZHVsZSBhLm91dF0KLi4uCgpBZnRlciB0aGlzLCBpdCBzdGlsbCBjcmFz aGVzIGJlY2F1c2UgdGhpcyBjb2RlIGluCmR3Ml9kZWJ1Z19uYW1lc19pdGVyYXRvcjo6bmV4 dDoKLi4uCiAgLyogU2tpcCBpZiBhbHJlYWR5IHJlYWQgaW4uICAqLwogIGlmIChtX3Blcl9v YmpmaWxlLT5zeW10YWJfc2V0X3AgKHBlcl9jdSkpCiAgICBnb3RvIGFnYWluOwouLi4KaXMg Y2FsbGVkIHdpdGggcGVyX2N1ID09IG51bGxwdHIuCgpGaXggdGhpcyBieSBza2lwcGluZyB0 aGUgZW50cnkgaWYgcGVyX2N1ID09IG51bGxwdHIuCgpOb3cgcmV2ZXJ0IHRoZSBmaXggYW5k IG9ic2VydmUgdGhhdCB0aGUgY29tcGxhaW50IGRpc2FwcGVhcnMsIHNvIHdlJ3ZlCmNvbmZp cm1lZCB0aGF0IHRoZSBmaXggaXMgcmVxdWlyZWQuCgpBIHNvbWV3aGF0IHNpbWlsYXIgaXNz dWUgZm9yIC5nZGJfaW5kZXggaW4gZHcyX3N5bXRhYl9pdGVyX25leHQgaGFzIGJlZW4gZmls ZWQKYXMgUFIyOTM2Ny4KClRlc3RlZCBvbiB4ODZfNjQtbGludXgsIHdpdGggbmF0aXZlIGFu ZCB0YXJnZXQgYm9hcmQgY2Mtd2l0aC1kZWJ1Zy1uYW1lcy4KCkJ1ZzogaHR0cHM6Ly9zb3Vy Y2V3YXJlLm9yZy9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9MjkzMzYKCi0tLQogZ2RiL2R3 YXJmMi9yZWFkLmMgfCAyNiArKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv Z2RiL2R3YXJmMi9yZWFkLmMgYi9nZGIvZHdhcmYyL3JlYWQuYwppbmRleCBiY2QwMTEwNzM3 Ny4uNDIyMzA2MDdmZTAgMTAwNjQ0Ci0tLSBhL2dkYi9kd2FyZjIvcmVhZC5jCisrKyBiL2dk Yi9kd2FyZjIvcmVhZC5jCkBAIC00OTcwLDE1ICs0OTcwLDE5IEBAIGR3Ml9kZWJ1Z19uYW1l c19pdGVyYXRvcjo6bmV4dCAoKQogICAgICAgc3dpdGNoIChhdHRyLmR3X2lkeCkKIAl7CiAJ Y2FzZSBEV19JRFhfY29tcGlsZV91bml0OgotCSAgLyogRG9uJ3QgY3Jhc2ggb24gYmFkIGRh dGEuICAqLwotCSAgaWYgKHVsbCA+PSBwZXJfYmZkLT5hbGxfY29tcF91bml0cy5zaXplICgp KQotCSAgICB7Ci0JICAgICAgY29tcGxhaW50IChfKCIuZGVidWdfbmFtZXMgZW50cnkgaGFz IGJhZCBDVSBpbmRleCAlcyIKLQkJCSAgICIgW2luIG1vZHVsZSAlc10iKSwKLQkJCSBwdWxv bmdlc3QgKHVsbCksCi0JCQkgb2JqZmlsZV9uYW1lIChvYmpmaWxlKSk7Ci0JICAgICAgY29u dGludWU7Ci0JICAgIH0KKwkgIHsKKwkgICAgLyogRG9uJ3QgY3Jhc2ggb24gYmFkIGRhdGEu ICAqLworCSAgICBpbnQgbnJfY3VzID0gKHBlcl9iZmQtPmFsbF9jb21wX3VuaXRzLnNpemUg KCkKKwkJCSAgLSBwZXJfYmZkLT50dV9zdGF0cy5ucl90dXMpOworCSAgICBpZiAodWxsID49 IG5yX2N1cykKKwkgICAgICB7CisJCWNvbXBsYWludCAoXygiLmRlYnVnX25hbWVzIGVudHJ5 IGhhcyBiYWQgQ1UgaW5kZXggJXMiCisJCQkgICAgICIgW2luIG1vZHVsZSAlc10iKSwKKwkJ CSAgIHB1bG9uZ2VzdCAodWxsKSwKKwkJCSAgIG9iamZpbGVfbmFtZSAob2JqZmlsZSkpOwor CQljb250aW51ZTsKKwkgICAgICB9CisJICB9CiAJICBwZXJfY3UgPSBwZXJfYmZkLT5nZXRf Y3UgKHVsbCk7CiAJICBicmVhazsKIAljYXNlIERXX0lEWF90eXBlX3VuaXQ6CkBAIC01MDE2 LDYgKzUwMjAsMTAgQEAgZHcyX2RlYnVnX25hbWVzX2l0ZXJhdG9yOjpuZXh0ICgpCiAJfQog ICAgIH0KIAorICAvKiBTa2lwIGlmIHdlIGNvdWxkbid0IGZpbmQgYSB2YWxpZCBDVS9UVSBp bmRleC4gICovCisgIGlmIChwZXJfY3UgPT0gbnVsbHB0cikKKyAgICBnb3RvIGFnYWluOwor CiAgIC8qIFNraXAgaWYgYWxyZWFkeSByZWFkIGluLiAgKi8KICAgaWYgKG1fcGVyX29iamZp bGUtPnN5bXRhYl9zZXRfcCAocGVyX2N1KSkKICAgICBnb3RvIGFnYWluOwo= --------------wX9RBvzCkG0PBCiHXPaoPDw1--