From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 72814 invoked by alias); 16 Oct 2017 14:04:28 -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 72799 invoked by uid 89); 16 Oct 2017 14:04:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,MIME_BASE64_BLANKS,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mga06.intel.com Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Oct 2017 14:04:21 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP; 16 Oct 2017 07:04:19 -0700 X-ExtLoop1: 1 Received: from irsmsx151.ger.corp.intel.com ([163.33.192.59]) by orsmga002.jf.intel.com with ESMTP; 16 Oct 2017 07:04:17 -0700 Received: from irsmsx104.ger.corp.intel.com ([169.254.5.248]) by IRSMSX151.ger.corp.intel.com ([169.254.4.108]) with mapi id 14.03.0319.002; Mon, 16 Oct 2017 15:04:16 +0100 From: "Tedeschi, Walfred" To: Pedro Alves , "gdb-patches@sourceware.org" Subject: RE: [pushed 8.0-branch] [Bug server/22137] gdbserver crashes on hosts with pkru register Date: Mon, 16 Oct 2017 14:04:00 -0000 Message-ID: References: <4e1810f2-a6cd-1c80-bdc6-6588e8759246@redhat.com> In-Reply-To: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 X-IsSubscribed: yes X-SW-Source: 2017-10/txt/msg00441.txt.bz2 DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogUGVk cm8gQWx2ZXMgW21haWx0bzpwYWx2ZXNAcmVkaGF0LmNvbV0NCj4gU2VudDog TW9uZGF5LCBPY3RvYmVyIDE2LCAyMDE3IDM6NDQgUE0NCj4gVG86IFRlZGVz Y2hpLCBXYWxmcmVkIDx3YWxmcmVkLnRlZGVzY2hpQGludGVsLmNvbT47IGdk Yi0NCj4gcGF0Y2hlc0Bzb3VyY2V3YXJlLm9yZw0KPiBTdWJqZWN0OiBSZTog W3B1c2hlZCA4LjAtYnJhbmNoXSBbQnVnIHNlcnZlci8yMjEzN10gZ2Ric2Vy dmVyIGNyYXNoZXMgb24NCj4gaG9zdHMgd2l0aCBwa3J1IHJlZ2lzdGVyDQo+ IA0KPiBPbiAxMC8xNi8yMDE3IDAyOjIwIFBNLCBUZWRlc2NoaSwgV2FsZnJl ZCB3cm90ZToNCj4gPg0KPiA+Pj4gPiA+IEkgYWxzbyBjb3VsZG4ndCBjb21w aWxlIG1hc3RlcjoNCj4gPj4+ID4gPiAuLi8uLi8uLi9iaW51dGlscy1nZGIv Z2RiL3Byb2JlLmM6IEluIGZ1bmN0aW9uIFx1MjAxOHZvaWQNCj4gPj4gPiBw YXJzZV9wcm9iZXNfaW5fcHNwYWNlKGNvbnN0IHByb2JlX29wcyosIHByb2dy YW1fc3BhY2UqLCBjb25zdA0KPiA+PiA+IGNoYXIqLCBjb25zdCBjaGFyKiwg Y29uc3QgY2hhciosDQo+IHN0ZDo6dmVjdG9yPHN5bXRhYl9hbmRfbGluZT4q KVx1MjAxOToNCj4gPj4+ID4gPiAuLi8uLi8uLi9iaW51dGlscy1nZGIvZ2Ri L3Byb2JlLmM6Njg6MTI6IGVycm9yOiB0eXBlcyBtYXkgbm90IGJlDQo+ID4+ PiA+ID4gZGVmaW5lZCBpbiBhDQo+ID4+ID4gZm9yLXJhbmdlLWRlY2xhcmF0 aW9uIFstV2Vycm9yXQ0KPiA+Pj4gPiA+ICAgICAgICBmb3IgKHN0cnVjdCBw cm9iZSAqcHJvYmUgOiBwcm9iZXMpDQo+ID4+PiA+ID4gICAgICAgICAgICAg Xn5+fn5+DQo+ID4+PiA+ID4gLi4vLi4vLi4vYmludXRpbHMtZ2RiL2dkYi9w cm9iZS5jOiBJbiBmdW5jdGlvbg0KPiA+Pj4gPiA+IFx1MjAxOFZFQ19wcm9i ZV9wKg0KPiA+PiA+IGZpbmRfcHJvYmVzX2luX29iamZpbGUob2JqZmlsZSos IGNvbnN0IGNoYXIqLCBjb25zdCBjaGFyKilcdTIwMTk6DQo+ID4+PiA+ID4g Li4vLi4vLi4vYmludXRpbHMtZ2RiL2dkYi9wcm9iZS5jOjIxMzo4OiBlcnJv cjogdHlwZXMgbWF5IG5vdCBiZQ0KPiA+Pj4gPiA+IGRlZmluZWQgaW4gYQ0K PiA+PiA+IGZvci1yYW5nZS1kZWNsYXJhdGlvbiBbLVdlcnJvcl0NCj4gPj4+ ID4gPiAgICBmb3IgKHN0cnVjdCBwcm9iZSAqcHJvYmUgOiBwcm9iZXMpDQo+ ID4+PiA+ID4gICAgICAgICBefn5+fn4NCj4gPj4+ID4gPg0KPiA+Pj4gPiA+ IEFyZSB5b3UgYXdhcmUgb2YgaXQ/DQo+ID4+ID4NCj4gPj4gPiBZZXMsIGl0 J3MgYSBHQ0MgYnVnOg0KPiA+PiA+ICBodHRwczovL3NvdXJjZXdhcmUub3Jn L21sL2dkYi1wYXRjaGVzLzIwMTctMDkvbXNnMDAyNzAuaHRtbA0KPiA+PiA+ DQo+ID4+ID4gV2hhdCBpcyB5b3VyIGdjYyB2ZXJzaW9uPw0KPiA+PiA+DQo+ ID4+ID4gSSBkb24ndCBzZWUgdGhpcyBteXNlbGYsIGJ1dCBJIGtub3cgdGhh dCBLZWl0aCBhbHNvIHJhbiBpbnRvIHRoaXMNCj4gPj4gPiByZWNlbnRseS4g IElmIGl0J3MgZWFzeSB0byB3b3JrIGFyb3VuZCBpdCwgSSBkb24ndCBzZWUg d2h5IG5vdC4NCj4gPj4gPg0KPiA+PiA+IERvZXMgdGhpcyB3b3JrIGZvciB5 b3U/DQo+ID4+ID4NCj4gPiBJdCB3b3JrZWQhDQo+IA0KPiBUaGFua3MsIEkn bGwgcHVzaCBpbiBhIGJpdC4gIEknbSBzdGlsbCBjdXJpb3VzIHRvIGtub3cg eW91ciBnY2MgdmVyc2lvbiB0aG91Z2guDQpWZXJzaW9uIGlzIDYuMy4xDQo+ IA0KPiBBY3R1YWxseSwgSSdtIGNvbmZ1c2VkIG9uIGhvdyBpdCB3b3JrZWQg Zm9yIHlvdSwgc2luY2UgSSBoYWRuJ3QgZml4ZWQgdGhlDQo+IHNhbWUgcHJv YmxlbSBhcm91bmQgbGluZSAiMjEzIiBxdW90ZWQgYWJvdmUuDQo+IA0KWWVz IHRoZXJlIHdlcmUgbW9yZSwgSSBmaXhlZCBpbiB0aGUgc2FtZSB3YXksIGZ1 bGwgcGF0Y2ggaXMgaGVyZToNCg0KZGlmZiAtLWdpdCBhL2dkYi9lbGZyZWFk LmMgYi9nZGIvZWxmcmVhZC5jDQppbmRleCA0MzZkOWI1Li44YTEyYjU2IDEw MDY0NA0KLS0tIGEvZ2RiL2VsZnJlYWQuYw0KKysrIGIvZ2RiL2VsZnJlYWQu Yw0KQEAgLTEzNDAsOCArMTM0MCw4IEBAIHByb2JlX2tleV9mcmVlIChiZmQg KmFiZmQsIHZvaWQgKmQpDQogew0KICAgc3RkOjp2ZWN0b3I8cHJvYmUgKj4g KnByb2JlcyA9IChzdGQ6OnZlY3Rvcjxwcm9iZSAqPiAqKSBkOw0KIA0KLSAg Zm9yIChzdHJ1Y3QgcHJvYmUgKnByb2JlIDogKnByb2JlcykNCi0gICAgcHJv YmUtPnBvcHMtPmRlc3Ryb3kgKHByb2JlKTsNCisgIGZvciAocHJvYmUgKnBy b2IgOiAqcHJvYmVzKQ0KKyAgICBwcm9iLT5wb3BzLT5kZXN0cm95IChwcm9i KTsNCiANCiAgIGRlbGV0ZSBwcm9iZXM7DQogfQ0KZGlmZiAtLWdpdCBhL2dk Yi9wcm9iZS5jIGIvZ2RiL3Byb2JlLmMNCmluZGV4IGIzZGJmODkuLjQ4Nzg0 N2MgMTAwNjQ0DQotLS0gYS9nZGIvcHJvYmUuYw0KKysrIGIvZ2RiL3Byb2Jl LmMNCkBAIC02NSwyMyArNjUsMjMgQEAgcGFyc2VfcHJvYmVzX2luX3BzcGFj ZSAoY29uc3Qgc3RydWN0IHByb2JlX29wcyAqcHJvYmVfb3BzLA0KICAgICAg IGNvbnN0IHN0ZDo6dmVjdG9yPHByb2JlICo+ICZwcm9iZXMNCiAJPSBvYmpm aWxlLT5zZi0+c3ltX3Byb2JlX2Zucy0+c3ltX2dldF9wcm9iZXMgKG9iamZp bGUpOw0KIA0KLSAgICAgIGZvciAoc3RydWN0IHByb2JlICpwcm9iZSA6IHBy b2JlcykNCisgICAgICBmb3IgKHByb2JlICpwcm8gOiBwcm9iZXMpDQogCXsN Ci0JICBpZiAocHJvYmVfb3BzICE9ICZwcm9iZV9vcHNfYW55ICYmIHByb2Jl LT5wb3BzICE9IHByb2JlX29wcykNCisJICBpZiAocHJvYmVfb3BzICE9ICZw cm9iZV9vcHNfYW55ICYmIHByby0+cG9wcyAhPSBwcm9iZV9vcHMpDQogCSAg ICBjb250aW51ZTsNCiANCi0JICBpZiAocHJvdmlkZXIgJiYgc3RyY21wIChw cm9iZS0+cHJvdmlkZXIsIHByb3ZpZGVyKSAhPSAwKQ0KKwkgIGlmIChwcm92 aWRlciAmJiBzdHJjbXAgKHByby0+cHJvdmlkZXIsIHByb3ZpZGVyKSAhPSAw KQ0KIAkgICAgY29udGludWU7DQogDQotCSAgaWYgKHN0cmNtcCAocHJvYmUt Pm5hbWUsIG5hbWUpICE9IDApDQorCSAgaWYgKHN0cmNtcCAocHJvLT5uYW1l LCBuYW1lKSAhPSAwKQ0KIAkgICAgY29udGludWU7DQogDQogCSAgc3ltdGFi X2FuZF9saW5lIHNhbDsNCi0JICBzYWwucGMgPSBnZXRfcHJvYmVfYWRkcmVz cyAocHJvYmUsIG9iamZpbGUpOw0KKwkgIHNhbC5wYyA9IGdldF9wcm9iZV9h ZGRyZXNzIChwcm8sIG9iamZpbGUpOw0KIAkgIHNhbC5leHBsaWNpdF9wYyA9 IDE7DQogCSAgc2FsLnNlY3Rpb24gPSBmaW5kX3BjX292ZXJsYXkgKHNhbC5w Yyk7DQogCSAgc2FsLnBzcGFjZSA9IHNlYXJjaF9wc3BhY2U7DQotCSAgc2Fs LnByb2JlID0gcHJvYmU7DQorCSAgc2FsLnByb2JlID0gcHJvOw0KIAkgIHNh bC5vYmpmaWxlID0gb2JqZmlsZTsNCiANCiAJICByZXN1bHQtPnB1c2hfYmFj ayAoc3RkOjptb3ZlIChzYWwpKTsNCkBAIC0yMTAsMTUgKzIxMCwxNSBAQCBm aW5kX3Byb2Jlc19pbl9vYmpmaWxlIChzdHJ1Y3Qgb2JqZmlsZSAqb2JqZmls ZSwgY29uc3QgY2hhciAqcHJvdmlkZXIsDQogDQogICBjb25zdCBzdGQ6OnZl Y3Rvcjxwcm9iZSAqPiAmcHJvYmVzDQogICAgID0gb2JqZmlsZS0+c2YtPnN5 bV9wcm9iZV9mbnMtPnN5bV9nZXRfcHJvYmVzIChvYmpmaWxlKTsNCi0gIGZv ciAoc3RydWN0IHByb2JlICpwcm9iZSA6IHByb2JlcykNCisgIGZvciAocHJv YmUgKnByb2IgOiBwcm9iZXMpDQogICAgIHsNCi0gICAgICBpZiAoc3RyY21w IChwcm9iZS0+cHJvdmlkZXIsIHByb3ZpZGVyKSAhPSAwKQ0KKyAgICAgIGlm IChzdHJjbXAgKHByb2ItPnByb3ZpZGVyLCBwcm92aWRlcikgIT0gMCkNCiAJ Y29udGludWU7DQogDQotICAgICAgaWYgKHN0cmNtcCAocHJvYmUtPm5hbWUs IG5hbWUpICE9IDApDQorICAgICAgaWYgKHN0cmNtcCAocHJvYi0+bmFtZSwg bmFtZSkgIT0gMCkNCiAJY29udGludWU7DQogDQotICAgICAgVkVDX3NhZmVf cHVzaCAocHJvYmVfcCwgcmVzdWx0LCBwcm9iZSk7DQorICAgICAgVkVDX3Nh ZmVfcHVzaCAocHJvYmVfcCwgcmVzdWx0LCBwcm9iKTsNCiAgICAgfQ0KIA0K ICAgcmV0dXJuIHJlc3VsdDsNCkBAIC0yNDQsMTEgKzI0NCwxMSBAQCBmaW5k X3Byb2JlX2J5X3BjIChDT1JFX0FERFIgcGMpDQogICAgIC8qIElmIHRoaXMg cHJvdmVzIHRvbyBpbmVmZmljaWVudCwgd2UgY2FuIHJlcGxhY2Ugd2l0aCBh IGhhc2guICAqLw0KICAgICBjb25zdCBzdGQ6OnZlY3Rvcjxwcm9iZSAqPiAm cHJvYmVzDQogICAgICAgPSBvYmpmaWxlLT5zZi0+c3ltX3Byb2JlX2Zucy0+ c3ltX2dldF9wcm9iZXMgKG9iamZpbGUpOw0KLSAgICBmb3IgKHN0cnVjdCBw cm9iZSAqcHJvYmUgOiBwcm9iZXMpDQotICAgICAgaWYgKGdldF9wcm9iZV9h ZGRyZXNzIChwcm9iZSwgb2JqZmlsZSkgPT0gcGMpDQorICAgIGZvciAocHJv YmUgKnByb2IgOiBwcm9iZXMpDQorICAgICAgaWYgKGdldF9wcm9iZV9hZGRy ZXNzIChwcm9iLCBvYmpmaWxlKSA9PSBwYykNCiAJew0KIAkgIHJlc3VsdC5v YmpmaWxlID0gb2JqZmlsZTsNCi0JICByZXN1bHQucHJvYmUgPSBwcm9iZTsN CisJICByZXN1bHQucHJvYmUgPSBwcm9iOw0KIAkgIHJldHVybiByZXN1bHQ7 DQogCX0NCiAgIH0NCkBAIC0yOTQsMjAgKzI5NCwyMCBAQCBjb2xsZWN0X3By b2JlcyAoY29uc3Qgc3RkOjpzdHJpbmcgJm9iam5hbWUsIGNvbnN0IHN0ZDo6 c3RyaW5nICZwcm92aWRlciwNCiAgICAgICBjb25zdCBzdGQ6OnZlY3Rvcjxw cm9iZSAqPiAmcHJvYmVzDQogCT0gb2JqZmlsZS0+c2YtPnN5bV9wcm9iZV9m bnMtPnN5bV9nZXRfcHJvYmVzIChvYmpmaWxlKTsNCiANCi0gICAgICBmb3Ig KHN0cnVjdCBwcm9iZSAqcHJvYmUgOiBwcm9iZXMpDQorICAgICAgZm9yIChw cm9iZSAqcHJvYiA6IHByb2JlcykNCiAJew0KLQkgIGlmIChwb3BzICE9IE5V TEwgJiYgcHJvYmUtPnBvcHMgIT0gcG9wcykNCisJICBpZiAocG9wcyAhPSBO VUxMICYmIHByb2ItPnBvcHMgIT0gcG9wcykNCiAJICAgIGNvbnRpbnVlOw0K IA0KIAkgIGlmIChwcm92X3BhdA0KLQkgICAgICAmJiBwcm92X3BhdC0+ZXhl YyAocHJvYmUtPnByb3ZpZGVyLCAwLCBOVUxMLCAwKSAhPSAwKQ0KKwkgICAg ICAmJiBwcm92X3BhdC0+ZXhlYyAocHJvYi0+cHJvdmlkZXIsIDAsIE5VTEws IDApICE9IDApDQogCSAgICBjb250aW51ZTsNCiANCiAJICBpZiAocHJvYmVf cGF0DQotCSAgICAgICYmIHByb2JlX3BhdC0+ZXhlYyAocHJvYmUtPm5hbWUs IDAsIE5VTEwsIDApICE9IDApDQorCSAgICAgICYmIHByb2JlX3BhdC0+ZXhl YyAocHJvYi0+bmFtZSwgMCwgTlVMTCwgMCkgIT0gMCkNCiAJICAgIGNvbnRp bnVlOw0KIA0KLQkgIHJlc3VsdC5lbXBsYWNlX2JhY2sgKHByb2JlLCBvYmpm aWxlKTsNCisJICByZXN1bHQuZW1wbGFjZV9iYWNrIChwcm9iLCBvYmpmaWxl KTsNCiAJfQ0KICAgICB9DQoNCj4gQXJlIHlvdSBzdXJlIHlvdSB0ZXN0ZWQg d2l0aCB0aGUgc2FtZSBjb21waWxlcj8NCj4gDQo+IFRoYW5rcywNCj4gUGVk cm8gQWx2ZXMNCg0KDQpUaGFua3MgYW5kIHJlZ2FyZHMsDQovRnJlZA0KSW50 ZWwgRGV1dHNjaGxhbmQgR21iSApSZWdpc3RlcmVkIEFkZHJlc3M6IEFtIENh bXBlb24gMTAtMTIsIDg1NTc5IE5ldWJpYmVyZywgR2VybWFueQpUZWw6ICs0 OSA4OSA5OSA4ODUzLTAsIHd3dy5pbnRlbC5kZQpNYW5hZ2luZyBEaXJlY3Rv cnM6IENocmlzdGluIEVpc2Vuc2NobWlkLCBDaHJpc3RpYW4gTGFtcHJlY2h0 ZXIKQ2hhaXJwZXJzb24gb2YgdGhlIFN1cGVydmlzb3J5IEJvYXJkOiBOaWNv bGUgTGF1ClJlZ2lzdGVyZWQgT2ZmaWNlOiBNdW5pY2gKQ29tbWVyY2lhbCBS ZWdpc3RlcjogQW10c2dlcmljaHQgTXVlbmNoZW4gSFJCIDE4NjkyOAo= >From gdb-patches-return-142635-listarch-gdb-patches=sources.redhat.com@sourceware.org Mon Oct 16 14:15:53 2017 Return-Path: Delivered-To: listarch-gdb-patches@sources.redhat.com Received: (qmail 15516 invoked by alias); 16 Oct 2017 14:15:52 -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 15505 invoked by uid 89); 16 Oct 2017 14:15:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Oct 2017 14:15:50 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C6BC80465 for ; Mon, 16 Oct 2017 14:15:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3C6BC80465 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=palves@redhat.com Received: from cascais.lan (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DB8B5FCA8 for ; Mon, 16 Oct 2017 14:15:48 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [pushed] Work around GCC 6.3.1 bug Date: Mon, 16 Oct 2017 14:15:00 -0000 Message-Id: <1508163347-20268-1-git-send-email-palves@redhat.com> X-SW-Source: 2017-10/txt/msg00442.txt.bz2 Content-length: 4702 This commit works around a GCC 6.3.1 bug several people are hitting: https://sourceware.org/ml/gdb-patches/2017-09/msg00270.html https://sourceware.org/ml/gdb-patches/2017-10/msg00418.html It manifests like this: ../../../binutils-gdb/gdb/probe.c:68:12: error: types may not be defined in a for-range-declaration [-Werror] for (struct probe *probe : probes) ^~~~~~ Fix it by renaming the range-for named variables to something different from their type's name. gdb/ChangeLog: 2017-10-16 Pedro Alves * elfread.c (probe_key_free): Rename range-for variable. * probe.c (parse_probes_in_pspace, find_probes_in_objfile) (find_probe_by_pc, collect_probes): Rename range-for variable. --- gdb/ChangeLog | 6 ++++++ gdb/elfread.c | 4 ++-- gdb/probe.c | 36 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1f72a24..cc81af8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-10-16 Pedro Alves + + * elfread.c (probe_key_free): Rename range-for variable. + * probe.c (parse_probes_in_pspace, find_probes_in_objfile) + (find_probe_by_pc, collect_probes): Rename range-for variable. + 2017-10-16 Yao Qi * features/Makefile (XMLTOC): Remove tic6x-*.xml. diff --git a/gdb/elfread.c b/gdb/elfread.c index 436d9b5..4e11071 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -1340,8 +1340,8 @@ probe_key_free (bfd *abfd, void *d) { std::vector *probes = (std::vector *) d; - for (struct probe *probe : *probes) - probe->pops->destroy (probe); + for (probe *p : *probes) + p->pops->destroy (p); delete probes; } diff --git a/gdb/probe.c b/gdb/probe.c index b3dbf89..eb6f537 100644 --- a/gdb/probe.c +++ b/gdb/probe.c @@ -65,23 +65,23 @@ parse_probes_in_pspace (const struct probe_ops *probe_ops, const std::vector &probes = objfile->sf->sym_probe_fns->sym_get_probes (objfile); - for (struct probe *probe : probes) + for (probe *p : probes) { - if (probe_ops != &probe_ops_any && probe->pops != probe_ops) + if (probe_ops != &probe_ops_any && p->pops != probe_ops) continue; - if (provider && strcmp (probe->provider, provider) != 0) + if (provider && strcmp (p->provider, provider) != 0) continue; - if (strcmp (probe->name, name) != 0) + if (strcmp (p->name, name) != 0) continue; symtab_and_line sal; - sal.pc = get_probe_address (probe, objfile); + sal.pc = get_probe_address (p, objfile); sal.explicit_pc = 1; sal.section = find_pc_overlay (sal.pc); sal.pspace = search_pspace; - sal.probe = probe; + sal.probe = p; sal.objfile = objfile; result->push_back (std::move (sal)); @@ -210,15 +210,15 @@ find_probes_in_objfile (struct objfile *objfile, const char *provider, const std::vector &probes = objfile->sf->sym_probe_fns->sym_get_probes (objfile); - for (struct probe *probe : probes) + for (probe *p : probes) { - if (strcmp (probe->provider, provider) != 0) + if (strcmp (p->provider, provider) != 0) continue; - if (strcmp (probe->name, name) != 0) + if (strcmp (p->name, name) != 0) continue; - VEC_safe_push (probe_p, result, probe); + VEC_safe_push (probe_p, result, p); } return result; @@ -244,11 +244,11 @@ find_probe_by_pc (CORE_ADDR pc) /* If this proves too inefficient, we can replace with a hash. */ const std::vector &probes = objfile->sf->sym_probe_fns->sym_get_probes (objfile); - for (struct probe *probe : probes) - if (get_probe_address (probe, objfile) == pc) + for (probe *p : probes) + if (get_probe_address (p, objfile) == pc) { result.objfile = objfile; - result.probe = probe; + result.probe = p; return result; } } @@ -294,20 +294,20 @@ collect_probes (const std::string &objname, const std::string &provider, const std::vector &probes = objfile->sf->sym_probe_fns->sym_get_probes (objfile); - for (struct probe *probe : probes) + for (probe *p : probes) { - if (pops != NULL && probe->pops != pops) + if (pops != NULL && p->pops != pops) continue; if (prov_pat - && prov_pat->exec (probe->provider, 0, NULL, 0) != 0) + && prov_pat->exec (p->provider, 0, NULL, 0) != 0) continue; if (probe_pat - && probe_pat->exec (probe->name, 0, NULL, 0) != 0) + && probe_pat->exec (p->name, 0, NULL, 0) != 0) continue; - result.emplace_back (probe, objfile); + result.emplace_back (p, objfile); } } -- 2.5.5