From patchwork Tue May 2 18:28:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 20223 Received: (qmail 111302 invoked by alias); 2 May 2017 18:29:05 -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 111280 invoked by uid 89); 2 May 2017 18:29:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sesbmg23.ericsson.net Received: from sesbmg23.ericsson.net (HELO sesbmg23.ericsson.net) (193.180.251.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 02 May 2017 18:29:03 +0000 Received: from ESESSHC017.ericsson.se (Unknown_Domain [153.88.183.69]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 61.10.24649.EEFC8095; Tue, 2 May 2017 20:29:02 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.69) with Microsoft SMTP Server (TLS) id 14.3.339.0; Tue, 2 May 2017 20:28:28 +0200 Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=ericsson.com; Received: from elxcz23q12-y4.ca.am.ericsson.se (192.75.88.130) by DB5PR07MB1717.eurprd07.prod.outlook.com (2603:10a6:0:12::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.1; Tue, 2 May 2017 18:28:26 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed] solib-target: Remove local variables Date: Tue, 2 May 2017 14:28:09 -0400 Message-ID: <20170502182809.10524-1-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: CY4PR13CA0010.namprd13.prod.outlook.com (2603:10b6:903:32::20) To DB5PR07MB1717.eurprd07.prod.outlook.com (2603:10a6:0:12::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d292ef2c-8278-44f9-e074-08d491890685 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DB5PR07MB1717; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1717; 3:r4tjs/AAumTwP2pBv3OVdiLQchKnyoWgvbDGE4mRMjuwKJGphyt/HdwOmJUV8XlajHJ9WPYNW7sGeR0A6gn3r39cEg3pjeLtlmXFfPXiZloJ5Y36VA5bgWU9DGGrmoJCjU5EcxHCIaNUG9ZkqrSy0UOsYLJwyJhgPgimgxgdTIgf5DDX/OocQdzcyMkcu5Dc4PDH2NPXC+NdG+Sl4GsKCtNsh51ZUCMmhkQIBeOZNKLQQkHMJ5QbH7JclNDhFMixL3CrcStTnUbOB8GOk7jv5G2FubR4716wC8uv+AWffoOBTe/XRYYD1+z4zcvJYuo3rByBMovvyK8fDAJRB9LChw==; 25:B8R3XoUPkmuCHpXmQVkcjOj4HweHk7hyJRanzHzrOqQw9kL7kWcjhCDEXk6piRMYgytKPkI5zE4hTLMV4xOQTELkN2qOEF1/wZzCrB7fjOeYpl4BwShGLdpDc1oa9kfBKKQF95Rjst7TBI7gnaPenHbTjqE5XUVkLLKFj2DNz+xmqpgR8H/JBqyWh6butwT9hX3NrhjTbaYmKxMgdrjFTG1vquCy7OkHIgfgDSSq75GUlXV8024RtHYPwIMi1NRd7qQ57ECkNWFW3Y6XUJxd/epYDN0VF+KHgO5JGiCkwJ1sf9OPqRiX8G59KGaDIgKob/lZci60T/yUNrGB9iyNcos/M7BjH9TCAspAnYOmMdjFRA8w62Hh6b5h97XYEjDMPtsEBfGfXNuGDrGquDsWq+sJFfhEn+xsPsj9tfEKaDJTeGUr/flxagwTne914iIUIgBJeRD6PpLFWdNUwNTJSMSakj4LExcyS0L4lB8Esis= X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1717; 31:nOmqt0nNOiJjE/tmKv+pEBRf1CYuys+N9PVB+CRs2WdD9vvdBe9tQfF+W2nWheF1IoyN5YOQmeOoAbkUaPBY5BfKWO8vfsUvG7+hfKD2i2lUTldKgZcdfEbW3eCty+1bWPPk4n/SGnIWonHfosil1IuO6gINBRyxfhuZtUKSY6M9KecjrDTLMxnNGsVk12En9NPlD/yg7gUTZIxwm6ATqQxGf3WbsCk7o/kYta6ARGg=; 20:SJ9mEdBfk9UaCBeuISUEnM90hI28lIrZk8aacf58/wBTRkREBylVIEMldDy6vemb03ppXToOITwRz+DBhyyPu712HKdKxKdBW4gnaf6E2a5y1aM7SriXztVcUzY5k31wDlJFSLxx1SswN/t0X01d5WlH1cbBWMdbO6M5JR37emY+5GrWwJ2Pi8E3DjlyGkdnotDpuJRx9JDyVyuaR19kEFmPGNUJ3u/GvPpLFkgOfRX7F2Bu+wEYkFvsjo40J7j0nSRdS9lsfTo730O0MWiOvPfWWDBPnNT+p0xZSkvJh3/eRj2qZn+nVc6xlHbq0bDb/yCOPHNrWB2aVlRX4JDTQ3TT0jzG50XY6jYdohmLbd4v8clGUM7H1rSBmPcdKGoSUXF5zG+eTNkM7ZbV9trhhSLfphGPPNkIc6jAeV/vqCiwACbMIFwg9apO8YS8DbzmWEUPyl7HXn8WCZxgODZ7L4Scm7/HVBw1ICIVpLxPzIje7oXZI2zp+9vvSESg3SKT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123555025)(20161123558100)(20161123562025)(6072148); SRVR:DB5PR07MB1717; BCL:0; PCL:0; RULEID:; SRVR:DB5PR07MB1717; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1717; 4:bq7IkjIixlYNPw7JfBgFAqnFRUBPLINQKnb/LMrWzhVLUnvlgSxQsUCqU8t2Lntz0sCrsIdiFa/NB62PLqE48ic9trcU/so5eOMyYer9Z4L3PfvWptCsqTrzY20/0CBJgvp1R+7alKEOA7CMVC8nQiDEt04Iz/L953KbcyPum+KlOFciuXsPsegNMGbxcxAxgkampWVtOrAHJ2kD4KXqz4jv6aphAukDm5it1dkmrdgrhNigCmv3TGCgAANQQUTnHmQu10oyAl6/8cFvcFemJz7baBb7TOtIHKlSjA2bb9yERQ3Cu7M6ECM5j4rsxRIwZAFPRmvC3n/D03GAVZclHoDRcLtUIOfWHp62qqjAJzoahZCFZUvv8aetiPXvRvXo+NT1w9bk6acTJA2pfURGbY9to6ZBiEM8xQc784g3MpIBy+WYJaBiXnwYqR8yweSVU/rWYXX5oddK8lvoD4qZsSGLZbFVKw5BjjxdCixFcQvXyaeMzzXK+4Im0MFFfXlx8s/8/08WH7ki2bXflwU9wrTJfMphikGYXUnMzgf7n5WuvLzHsargoFH6EJCAp/EtlN7EArphBzo9DkEAeQ3ucNoKnGLXCxoUanzDO/568Kd0iJeoFxOBGoV4MtNKX7CofVd4yp4S9a8qWZbvKoZuLZVewF2WUjtExFP64kfvfxNeq9ZHxZIUHqievshLfv8BysFw5ltYLmnT6sWdIQOvd3jSshaw+JgAknkVXGbhAwapEobnYVY93zfMBu6Jc3fBcYi1ejHyLJT+8vGLbyzj9ZcGU4WTXuVLTPjEgl38ioSvkI630cXAC4Cy1OTGCTkItujVanjmrRH/D/60KSeq1A== X-Forefront-PRVS: 02951C14DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39410400002)(39400400002)(39850400002)(39860400002)(39840400002)(39450400003)(69234005)(377424004)(54534003)(7736002)(25786009)(6116002)(38730400002)(110136004)(107886003)(1076002)(42186005)(86362001)(2906002)(5003940100001)(3846002)(2351001)(8676002)(81166006)(189998001)(4326008)(50226002)(50466002)(48376002)(6486002)(5660300001)(575784001)(53936002)(6512007)(47776003)(66066001)(50986999)(6916009)(36756003)(6666003)(305945005)(33646002)(478600001)(6506006); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR07MB1717; H:elxcz23q12-y4.ca.am.ericsson.se; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR07MB1717; 23:GwvzTrLEIktFVDPOq2diAKZZ8i9WltEXBSUexOv66?= =?us-ascii?Q?F6eJz2EtH10PQbSE084kXZgk8+vgujyvcB60jgSh0V/cOTRcp6YOlK5j2rY2?= =?us-ascii?Q?OkcbVWb4ekMKZsxLzfHFUXO8VQgYCvntydDNhJ5DJ2yIvSLXWMkdlSQITKaB?= =?us-ascii?Q?zznFEFwMF+y0a9ggd6FuIn+32fQBNfyjZ6Aetu3Qls7ocE16JAgDkgLlCYw7?= =?us-ascii?Q?0wuzKHXsIkVB+dQN0riUuLVAsUYLb0Cxx4nx0J4NQTE6avohS6qulM0Jwiwg?= =?us-ascii?Q?6ftY9jWQdlrkgS9uKG+Slk0UaKa4gA/fOspxwAeVAsUJcCR7Smplz5BYJ+jD?= =?us-ascii?Q?rLmGh5C1iGClJzVs+5Hz95UxCJ1DgX6lZUMl6E0XThq4OztryekIpeYGRcHS?= =?us-ascii?Q?iwr/ek1fymeZk1s5dEaiAG0ntZETeWLFxPSwbrVU1b2fcxO2crF03Vd8RFSK?= =?us-ascii?Q?X+8Sq2Z7a0CJ8l6Ou91fjEI9O3jGXYbbK5OUAlktrUFaDxQMBWF6b44WBLP5?= =?us-ascii?Q?YxHbgVVLUGhR/cQIycz60rua3F6mAioTuB/GlzNYoOWe1hJgpgXsceULK/3a?= =?us-ascii?Q?EtiZ8r4fX6LSqCGMLIm6ycLRqk3S7QWjVgiHrkP3KZGibcbOFahAlOBoY+pK?= =?us-ascii?Q?CPafAwztBSaPlv56fISBBxcFrFYvOLiEKecOdWNI1MscMW58rvTTY8/IueOk?= =?us-ascii?Q?RdyPvRVpcU8JZ3SsqlwZKgxJMHnPU73lYViFpa1LNjpTP3v2LgI3sb0I7OEn?= =?us-ascii?Q?Xm5DRlM60YRTiCv5OyjCargZPdBxU9O25XANDmW1aPbfUt9V+zsGDsMgMaxB?= =?us-ascii?Q?68Bj5S4JN0WU8p8ovs6CuERjFDIJO+EZgEtK3qVA6POryrm0eiG6qzTjboAC?= =?us-ascii?Q?O7lZmbj788i2ksyPsh1u70MGS3DFwI/8FiYG3Pco/n/sm8qvV/XbtBg0DufN?= =?us-ascii?Q?QhNu7zWWSxskVkHotntClLDMQBSgOBA9PJ8RxVRQQqD/l6Nontqtrg6BQQf5?= =?us-ascii?Q?j/t9E4vW4HGhBpRsyty727xYOQM32wlTEuJ1h85r3B+Yce4IUyXPjBPw2Opn?= =?us-ascii?Q?FYFjpubBVa4b1iFi8FadZHtRYTDk4F1iuoRpfxd1+jfxZHBJezGH9K47RIuC?= =?us-ascii?Q?SaMwSpavRIIbnzRLBnV0qwBTswdzILqpeKwFq12Hq7opeSguqKcgw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1717; 6:ZMWN8wHnALupQ6CX1aXzN2CsXbwSWjNplzsHCoB19rdglmwUqEPDgbyvDK15ttTTy94L0XbkWH9S3lAdIqOQ/8hMy2E+SiN0gbAWyb4S7UQzqP9CN29eNwSoTcWqxqa4dwPDfXG3Ym6eXhZUsA9OZH+BopA7QlA3PBbCZhH/v36JukvhJS9PKPGzqA5NAnQC6EaRoeAEuy8UdHxInp1Te2TchpdqVO5w+TEoPkX18BQ+rMZ1bIt9D7oOGdLUeNSwyi5E6JYXoehyXYEq5rsdtwQ59vDwltozHdu4Snzjw8NHvIc0wMTUWPWIdgUhKhDLStRHmTdmmzROAXu6/9TvtrdACBHF/x2C0mEjqLFy+OqMwNtb8v0FUM/LNLSNUlqJBT2HMp+QNzvW/90K0yT3aGsLxwu1ib53zP4hnuwJ1v98L4rken9nQtcCLUgnKt/Og2C3CwGDxRA8fHdwZS7HJ33pqdREBFemNZPMCS/tlgIUsF/rbTTwiWeKbfcZWoQdguDHxruGW0IKaC8Uj8g2oQ==; 5:pbW1x9zjTCitZN8vQlARzby6bwyDCIKfcv1tyOqy/GAzP7kNAwleAyTSUlu3ESBjp1WXFnezQPm3GpBbxfs9nlwfYkNTHFcNoNxvz//shCsr3YuYZMk5xy9lNyLazd6CLMZI5J463uK7r1nbYaEgRw==; 24:CCmFlTDggc9ZWf5iI4TlCHAe715kMLAP3MBhyyIS/x//fV9NIxqXPV4y55QIPOJ/KxZZZQZvYXVJaCyurx3ZYHhzG3PQ+xFV/Ncv/Dq6L/0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1717; 7:AbrSbKftDfx0jMNfJOwavP+ps42SA8jq8WvMyKMjYiuocFdvmp5rHZkGrcvSR+6LtUvVfwnLI3eEifzohtX4FYkJ83+ksqlwRMTlhCNDkQUibUIn8CCm0wQr+n6jYUJ57AeynT1CMJXD3rc8tml95c6+U6R2XsZHVXgoPr2+hA2dyDtKKJOLYslxWh35lYZ1GWU35skix3mWY1vJpH0Xqa3gfDmwuCJIH4tsYlbEWDj0mGok/0AIYesFQdNPeSCbPmQ1lOfNROBl6WkS2GHe++NjDKZ5D1qObAhZlE+y1umczgat38O59Fh+HmS7TLKN4Um08JhXhAMoFAuICOffHg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2017 18:28:26.5035 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB1717 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes FYI, I pushed this cleanup patch. Now that we use std::vector, these local variables are not very useful. They're not much shorter than the expressions they stand for. gdb/ChangeLog: * solib-target.c (solib_target_relocate_section_addresses): Remove num_section_bases, num_bases, segment_bases variables. --- gdb/ChangeLog | 5 +++++ gdb/solib-target.c | 22 +++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b82cfd53a8..f441585488 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-05-02 Simon Marchi + + * solib-target.c (solib_target_relocate_section_addresses): + Remove num_section_bases, num_bases, segment_bases variables. + 2017-05-02 Simon Marchi * common/gdb_vecs.h (DEF_VEC_I (CORE_ADDR)): Remove. diff --git a/gdb/solib-target.c b/gdb/solib-target.c index 2e9b96273d..71a0da322c 100644 --- a/gdb/solib-target.c +++ b/gdb/solib-target.c @@ -347,7 +347,6 @@ solib_target_relocate_section_addresses (struct so_list *so, { int i; asection *sect; - int num_section_bases = li->section_bases.size (); int num_alloc_sections = 0; for (i = 0, sect = so->abfd->sections; @@ -356,7 +355,7 @@ solib_target_relocate_section_addresses (struct so_list *so, if ((bfd_get_section_flags (so->abfd, sect) & SEC_ALLOC)) num_alloc_sections++; - if (num_alloc_sections != num_section_bases) + if (num_alloc_sections != li->section_bases.size ()) warning (_("\ Could not relocate shared library \"%s\": wrong number of ALLOC sections"), so->so_name); @@ -407,37 +406,34 @@ Could not relocate shared library \"%s\": no segments"), so->so_name); { ULONGEST orig_delta; int i; - int num_bases; - CORE_ADDR *segment_bases; - - num_bases = li->segment_bases.size (); - segment_bases = li->segment_bases.data (); if (!symfile_map_offsets_to_segments (so->abfd, data, li->offsets, - num_bases, segment_bases)) + li->segment_bases.size (), + li->segment_bases.data ())) warning (_("\ Could not relocate shared library \"%s\": bad offsets"), so->so_name); /* Find the range of addresses to report for this library in "info sharedlibrary". Report any consecutive segments which were relocated as a single unit. */ - gdb_assert (num_bases > 0); - orig_delta = segment_bases[0] - data->segment_bases[0]; + gdb_assert (li->segment_bases.size () > 0); + orig_delta = li->segment_bases[0] - data->segment_bases[0]; for (i = 1; i < data->num_segments; i++) { /* If we have run out of offsets, assume all remaining segments have the same offset. */ - if (i >= num_bases) + if (i >= li->segment_bases.size ()) continue; /* If this segment does not have the same offset, do not include it in the library's range. */ - if (segment_bases[i] - data->segment_bases[i] != orig_delta) + if (li->segment_bases[i] - data->segment_bases[i] + != orig_delta) break; } - so->addr_low = segment_bases[0]; + so->addr_low = li->segment_bases[0]; so->addr_high = (data->segment_bases[i - 1] + data->segment_sizes[i - 1] + orig_delta);