From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 105924 invoked by alias); 29 Mar 2017 14:38:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 105192 invoked by uid 89); 29 Mar 2017 14:38:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,MIME_BASE64_BLANKS,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy=fancy, Tel, tel, office X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 29 Mar 2017 14:38:48 +0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Mar 2017 07:38:47 -0700 X-ExtLoop1: 1 Received: from irsmsx106.ger.corp.intel.com ([163.33.3.31]) by orsmga005.jf.intel.com with ESMTP; 29 Mar 2017 07:38:46 -0700 Received: from irsmsx156.ger.corp.intel.com (10.108.20.68) by IRSMSX106.ger.corp.intel.com (163.33.3.31) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 29 Mar 2017 15:38:45 +0100 Received: from irsmsx104.ger.corp.intel.com ([169.254.5.170]) by IRSMSX156.ger.corp.intel.com ([169.254.3.246]) with mapi id 14.03.0319.002; Wed, 29 Mar 2017 15:38:45 +0100 From: "Metzger, Markus T" To: Yao Qi CC: "gdb-patches@sourceware.org" , "Wiederhake, Tim" , "xdje42@gmail.com" , "Joel Brobecker" Subject: RE: GDB 8.0 release/branching 2017-03-20 update Date: Wed, 29 Mar 2017 14:38:00 -0000 Message-ID: References: <20170320201629.pbjzaqsnvs7dx7f2@adacore.com> <86zigevkv0.fsf@gmail.com> <86inn1utkp.fsf@gmail.com> <86inmzvrbx.fsf@gmail.com> <86shm2u47t.fsf@gmail.com> <86wpbbnf1f.fsf@gmail.com> <86shlyoggb.fsf@gmail.com> <86mvc5o7o4.fsf@gmail.com> <86a885o0z2.fsf@gmail.com> <861stgo072.fsf@gmail.com> In-Reply-To: <861stgo072.fsf@gmail.com> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 X-IsSubscribed: yes X-SW-Source: 2017-03/txt/msg00504.txt.bz2 SGVsbG8gWWFvLA0KDQo+ID4gTm93IEknbSBhIGJpdCBsb3N0LiAgV2hhdCBl eGFjdGx5IGRvIHlvdSB3YW50IGNoYW5nZWQgYXQgdGhpcyBwb2ludCB0bw0K PiA+IGVzdGFibGlzaCB0aGUgUHl0aG9uIGludGVyZmFjZT8NCj4gDQo+IEkg cmVxdWVzdGVkIHRoZSBjaGFuZ2UgdG8gUHl0aG9uIGludGVyZmFjZSwgYXMg ZGVzY3JpYmVkDQo+IGh0dHBzOi8vc291cmNld2FyZS5vcmcvbWwvZ2RiLXBh dGNoZXMvMjAxNy0wMy9tc2cwMDM2Ni5odG1sIGFuZCB0aGUNCj4gcHl0aG9u IGludGVyZmFjZSBpcyBpbXBsZW1lbnRhYmxlLCBub3RoaW5nIG9kZCBvciBm YW5jeSB0aGVyZS4gIEkgd2FudDoNCj4gDQo+ICAxLCB3ZSBhZ3JlZSBvbiB0 aGF0IG5ldyBweXRob24gaW50ZXJmYWNlLA0KPiAgMiwgZGVjaWRlIHdlIGVp dGhlciBjaGFuZ2UgdGhlIHB5dGhvbiBpbnRlcmZhY2UgYWNjb3JkaW5nIHRv IG15DQo+ICBwcm9wb3NhbCBiZWZvcmUgOC4wIHJlbGVhc2Ugb3IgcmVsZWFz ZSA4LjAgd2l0aG91dCB0aGVzZSByZWNvcmQNCj4gIChidHJhY2UpIHB5dGhv biBpbnRlcmZhY2VzLg0KPiANCj4gSSd2ZSBuZXZlciBzdWdnZXN0IGFueXRo aW5nIG9uIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgQ1B5dGhvbiBjb2Rl DQo+IGZvciB0aGUgcHl0aG9uIGludGVyZmFjZS4gIEFueXRoaW5nIHJlYXNv bmFibGUgaXMgZ29vZCB0byBtZSwgYW5kIHdlIGFyZQ0KPiBmcmVlIHRvIGNo YW5nZSB0aGVtIGJlY2F1c2UgdGhleSBhcmUgaW50ZXJuYWwgdGhpbmdzLiAg SG93IHRvIGVzdGFibGlzaA0KPiBzdWNoIHB5dGhvbiBpbnRlcmZhY2UgaXMg YSBsaXR0bGUgYml0IG91dCBvZiB0aGUgc2NvcGUgb2YgdGhpcw0KPiBkaXNj dXNzaW9uLCBidXQgbGV0IG1lIHRyeSBhZ2FpbiB0byBtYWtlIGl0IGNsZWFy Lg0KPiANCj4gSW4gbXkgcHJvcG9zYWwgYWJvdmUsIHdlIGhhdmUgUHl0aG9u IGNsYXNzZXMsDQo+IA0KPiBJbnN0cnVjdGlvbg0KPiB7DQo+ICAgIHBjLCBk YXRhLCBkZWNvZGUsIHNpemU7DQo+IH07DQo+IA0KPiBSZWNvcmRJbnN0cnVj dGlvbiA6IEluc3RydWN0aW9uDQo+IHsNCj4gICBzYWw7DQo+ICAgaXNfc3Bl Y3VsYXRpdmU7DQo+IH0NCg0KV2UgYWdyZWVkIG9uIHRoaXMgaW50ZXJmYWNl Lg0KDQpXaGF0IEknbSBsZXNzIGNsZWFyIGFib3V0IGlzIHdoYXQgY2hhbmdl cyB5b3UgYXJlIHJlcXVlc3RpbmcgaW4gb3JkZXIgdG8NCmVzdGFibGlzaCB0 aGF0IGludGVyZmFjZS4NCg0KU2hvdWxkIHdlIGp1c3QgZG9jdW1lbnQgaXQg dGhhdCB3YXk/DQpTaG91bGQgd2UgaW1wbGVtZW50IGFuIEluc3RydWN0aW9u IGJhc2UgY2xhc3MgdGhhdCB0aHJvd3MgaW4gYWxsIGZ1bmN0aW9ucz8NClNo b3VsZCB3ZSBpbXBsZW1lbnQgYW4gSW5zdHJ1Y3Rpb24gYmFzZSBjbGFzcyB0 aGF0IHJldHVybnMgTm9uZSBpbiBhbGwgZnVuY3Rpb25zPw0KDQpUaGFua3Ms DQpNYXJrdXMuDQpJbnRlbCBEZXV0c2NobGFuZCBHbWJIClJlZ2lzdGVyZWQg QWRkcmVzczogQW0gQ2FtcGVvbiAxMC0xMiwgODU1NzkgTmV1YmliZXJnLCBH ZXJtYW55ClRlbDogKzQ5IDg5IDk5IDg4NTMtMCwgd3d3LmludGVsLmRlCk1h bmFnaW5nIERpcmVjdG9yczogQ2hyaXN0aW4gRWlzZW5zY2htaWQsIENocmlz dGlhbiBMYW1wcmVjaHRlcgpDaGFpcnBlcnNvbiBvZiB0aGUgU3VwZXJ2aXNv cnkgQm9hcmQ6IE5pY29sZSBMYXUKUmVnaXN0ZXJlZCBPZmZpY2U6IE11bmlj aApDb21tZXJjaWFsIFJlZ2lzdGVyOiBBbXRzZ2VyaWNodCBNdWVuY2hlbiBI UkIgMTg2OTI4Cg== >From gdb-patches-return-137861-listarch-gdb-patches=sources.redhat.com@sourceware.org Wed Mar 29 15:06:17 2017 Return-Path: Delivered-To: listarch-gdb-patches@sources.redhat.com Received: (qmail 62306 invoked by alias); 29 Mar 2017 15:06:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 62297 invoked by uid 89); 29 Mar 2017 15:06:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=no version=3.3.2 spammy=H*UA:Roundcube, H*u:Roundcube, HX-PHP-Originating-Script:rcube.php X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 29 Mar 2017 15:06:14 +0000 Received: by simark.ca (Postfix, from userid 33) id E98FB1E80F; Wed, 29 Mar 2017 11:06:13 -0400 (EDT) To: Pedro Alves Subject: Re: [PATCH 1/5] dwarf2read.c: Some C++fycation, use std::vector, std::unique_ptr X-PHP-Originating-Script: 33:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 29 Mar 2017 15:06:00 -0000 From: Simon Marchi Cc: gdb-patches@sourceware.org In-Reply-To: <1490754298-9455-2-git-send-email-palves@redhat.com> References: <1490754298-9455-1-git-send-email-palves@redhat.com> <1490754298-9455-2-git-send-email-palves@redhat.com> Message-ID: X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.2.4 X-IsSubscribed: yes X-SW-Source: 2017-03/txt/msg00505.txt.bz2 Content-length: 1645 > -/* Add an entry to LH's include directory table. */ > - > -static void > -add_include_dir (struct line_header *lh, const char *include_dir) > +void > +line_header::add_include_dir (const char *include_dir) > { > if (dwarf_line_debug >= 2) > fprintf_unfiltered (gdb_stdlog, "Adding dir %u: %s\n", > - lh->num_include_dirs + 1, include_dir); > + (unsigned) include_dirs.size () + 1, include_dir); Can you use %zu for these? > @@ -17952,11 +17890,22 @@ dwarf_decode_line_header (unsigned int > offset, struct dwarf2_cu *cu) > if (lh->version >= 5) > { > /* Read directory table. */ > - read_formatted_entries (abfd, &line_ptr, lh, &cu->header, > - add_include_dir_stub); > + read_formatted_entries (abfd, &line_ptr, lh.get (), &cu->header, > + [] (struct line_header *lh, const char *name, > + unsigned int dir_index, unsigned int mod_time, > + unsigned int length) > + { > + lh->add_include_dir (name); > + }); > > /* Read file name table. */ > - read_formatted_entries (abfd, &line_ptr, lh, &cu->header, > add_file_name); > + read_formatted_entries (abfd, &line_ptr, lh.get (), &cu->header, > + [] (struct line_header *lh, const char *name, > + unsigned int dir_index, unsigned int mod_time, > + unsigned int length) > + { > + lh->add_file_name (name, dir_index, mod_time, length); > + }); We can do it afterwards to avoid adding noise to this patch, but I noticed that if we captured lh in the lambda, we could avoid passing the line_header in read_formatted_entries and the callback. I took a quick look, it looks good to me.