From patchwork Thu Nov 23 16:06:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24472 Received: (qmail 122968 invoked by alias); 23 Nov 2017 16:07:12 -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 122890 invoked by uid 89); 23 Nov 2017 16:07:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*f:sk:1511453, H*i:sk:1511453, H*MI:sk:1511453 X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 23 Nov 2017 16:07:10 +0000 Received: from ESESSHC008.ericsson.se (Unknown_Domain [153.88.183.42]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 9E.75.07741.422F61A5; Thu, 23 Nov 2017 17:07:00 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.42) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 23 Nov 2017 17:07:00 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by DB4PR07MB316.eurprd07.prod.outlook.com (2a01:111:e400:982f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.3; Thu, 23 Nov 2017 16:06:58 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed 2/2] Revert unexpected rename in previous patch Date: Thu, 23 Nov 2017 11:06:41 -0500 Message-ID: <1511453201-21204-2-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1511453201-21204-1-git-send-email-simon.marchi@ericsson.com> References: <1511453201-21204-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: MWHPR12CA0046.namprd12.prod.outlook.com (2603:10b6:301:2::32) To DB4PR07MB316.eurprd07.prod.outlook.com (2a01:111:e400:982f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b0809be-b983-4090-b300-08d5328c39d4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600025)(4604075)(2017052603258); SRVR:DB4PR07MB316; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 3:UKyuFNhGeXAbuHImKYFLtZ9EUAkFxjLnWBhzYf/KneKp2Lolp99nFPakjrpOcMXLvvLe1EyhLYz5TIABdLB/42kM0iBp3obXzVmaEx2+6iK353/TygBNuu7GqM5vJFQ6Yjt61/PxYfUGv0xqm6Yb5WrmPR5UZAj64Rsmdz0M8A7H9PrpUeivoZ76ecHbLJ0hsQVTzCNMlDvwKp3wAoeOaMlt+LI19psvOAccos5WUWxNiZGUW+3ToZ4RXQHGs2mJ; 25:wzLMm7wlYaDJmnjNF56D+iriCcZdXYQKn2Wk0H5XV616JSpmecq5gkyYaQtJdvvDXC7thxIX2A3Y075KME6ITZzlQ6ucAOvguZhrwe5fLpd2u+yVMQTnX99SGl6GJixGkqfIoGwQ0wlHCIk+EZr7fAM44WNABfb56ZXP+9CBaxWLlc4rtehRgbfoT25KnwBoXr9fxWlApFzcsrV39V4HbZ9vdGzxzkzhxBFY+G/UURP4LXlQlZLLX8a9jEqB2nP/yQUv1YVhKeikPvZ6jwXVbpiCWJiWjXRQPEyL1sxExWgBcZfSYkdvgnPZ7toxinLbFvoFXD21Ga/RszsOd11nBA==; 31:owI4Xq08Dg4g5aUpRXIkq/69NIai/3Envd50H033KGbD5wLPm7GoQ3p3YaaEmJvY/3LcUPjpKjoCmBDKjlcB6xfiF3zxXLGQixMIG/lxtBAV9uzxbtSx7K7Vb3TcGYLrV7HmBpsvFLUZeF+r6kJ17jXIhHQrsZlTUAfu1Q+1BAji0gMoaGb6e6OYa2It1y1b830pzBemE4CGP/DQnOjMh6PedD8czf1Un7Hq5P5RO/0= X-MS-TrafficTypeDiagnostic: DB4PR07MB316: X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 20:vj3nNdvbdnRW9+5eMKaVWr9OTzFq48miD8D6cr2r+psxPhW6YUMhf7bNnO3lyu6tHQEgK5yO2fqgCDYgmT1D5PmFMShpTioO4GzXyhkxl2xdwte2cvurj6riP7+P8B3AlYbCCbpQm5itdjXfLCGZp5kLU8wCyJq7IbAgIHouFVlgefuupzMvTfxHqvrmhIwwTngsBYPeWgNwsnwetOrAIGoSYo1eb3q20Jc8H3ewF+uqbK0zr2yE4LoEXWhgU2qFj1OH470Aa7K28ipAM29RCQtueYDDJx73YvcELHJwjZkEGqzaSV2atkkga3bdQgv7DCtVGHg3N+0sQuAfG8ktkLF7Tmh1OnearsKYetAMzblDTc0jgkARk+epbaVwhFJ1PYz1FQn2BLqBs+SHzjhIOqNEEPc62qVn1/uVAQk6tEYC2gBBdkkcgOTAqadv47B83rvdmEEjdZSX2tUKA+RcvMWnMt2p27rKfUU18m+Hg+c3UA86o/yeoAEgEwRrK9hF; 4:UFf4L5czY7kSRJfGUTQVNiyQSbLyAibyb4CXukCiHn3L4QR5ucCWhSXx6VtmSsl8x4wN5fcB37o7Bs4XnRAGe4G6u9Yn2R1q3J10M+ZTgK02cna/Ahz6zZaJLUqzkRI3lVh530reQdEoHaHEXI+ouYp1xfGAzR/ZzJ+C+QS3NwQDlNKUivx1lcWcyGgVy+1fSYzh4A9+c74L6u2IoKVjf1jO+6C4R4HrH+asB8E3nyL+NhdXJ6VgQafxVrAArlmGca6hcOFLPMwhbpnzOkuORepEBWyHknb7kecakiqWHzqrFn4tw1xsauHSZUi7JLsV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3231022)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB4PR07MB316; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB4PR07MB316; X-Forefront-PRVS: 05009853EF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(366004)(39860400002)(346002)(376002)(54534003)(189002)(377424004)(199003)(81166006)(3846002)(6116002)(81156014)(8676002)(5003940100001)(52116002)(36756003)(86362001)(478600001)(305945005)(48376002)(97736004)(50466002)(7736002)(47776003)(6486002)(6506006)(16526018)(66066001)(4001150100001)(4326008)(189998001)(50986999)(107886003)(5660300001)(6512007)(316002)(16586007)(53936002)(25786009)(8936002)(101416001)(105586002)(2361001)(33646002)(76176999)(106356001)(2351001)(50226002)(6916009)(2950100002)(6666003)(2906002)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB316; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR07MB316; 23:DFoNjJR1WMpHzmETRPqdhvWqbLa2rCqSnmOGedgm83?= =?us-ascii?Q?rHQbkjn6wFyDjeOb2bWXQeOLPUxZbrFvXrmrg3NTbRuGQngFKoqjqYaWoetT?= =?us-ascii?Q?qOets8FQPFxYYcASyDkkplMDgiCBWSzsxf2+PCpPAQU5XYiu/oKXc2+FhApA?= =?us-ascii?Q?v/zt7xCEyRgwU57zxSYKGUCweuQkXgUtgdXqagmDpzeXnyaE5Rm1JzmNrsa/?= =?us-ascii?Q?wJheHhqPb/xE8SJQrOZqP1mbMPpCV80I+1RoZgpOBkJOEX0xENlvliZ4/2py?= =?us-ascii?Q?81RNa4U2h1wu57u8zGI6nzY8CIiYn3IHZpV0JBn79dzta+qR9BYvddH4NdNU?= =?us-ascii?Q?BIShuk/cQuxW+6pkisuCLWuH22Myhhzy7duURGtOie692CU6eUAdB0d1qgiP?= =?us-ascii?Q?NZ0b+majJO9W/emxCZeG6CBmYNFG4RjyC2Z67T3txbFHhHiSUidN9ibwZWGs?= =?us-ascii?Q?OmFxLmufLRXCikMrOP2gL4f7emfFbpEMBTqjU94OwCV0V04qMFmFWC7HJCrq?= =?us-ascii?Q?nGMMXmzuzk7qHlEo/4XlPybFNsXUDxkQ8mRkVu6yXUp0D4SsutePGJo4kEhb?= =?us-ascii?Q?hp1y81bLQyjyI30l5AHpDF60FrCU+3BqYjkSaW9eFYjnDxAmimdhqKIKK2tR?= =?us-ascii?Q?9fTz8oJBSjHfY3NtMVEES2T2Y1QYGfQrXY0lKxJ0rAgY7FdyxBC/xykR9XNN?= =?us-ascii?Q?cyiBMrcrVH5M2LKLotm4oXQQmzWAurmgjvXRlHSyNOuWLkUyzXXAl1T8zLnM?= =?us-ascii?Q?9eijywR7qUwxXz0M6cpM9jKzIzKDi2uBha1vPO/bKUgXBuu6tE30mAXWdErg?= =?us-ascii?Q?8hr0Opey1Go36afp0IxqWR7DNeXhH3aQaL0BE3maYlGdaOigelYvCowXC91L?= =?us-ascii?Q?Sudw27iYKIDglQsCDVcms5+a8KbmjU1nYlNNMoY/FRgiZMfOIu0QdZn/C9bA?= =?us-ascii?Q?R28iMdrwnu6RxHZ8aJOXT9spAR3gCWnTjhl9RMyDmsvumdwizOEDJXFlrdQL?= =?us-ascii?Q?69WHP7qAifCAxR4Xm4vPp4lrm5HyM1wdH/dqP+LlRivQbEsXOBy/fl55ImH9?= =?us-ascii?Q?UxiXW3QOKYcs13evFcvurk6bQyIfElIFDDoV7LrO/z8UINR1USbJL9+XvA+t?= =?us-ascii?Q?TGN5//oLPbRCDgpX2oXFrlm7O/CREbhSUdSP947LGnScQvnWv+SnIxnEj/t8?= =?us-ascii?Q?vN3PLcbWzCDrnWjpCaF5LFXcJv/OoeozJSmTdz4k1tv6W11zBR8FWf9K5gxK?= =?us-ascii?Q?FoLwGZekVkAlt26SvsYf3zGSJ/QUmtGAc+H0Vg?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 6:cgAKPtre/Dbe8UzUQDF44fEzA1Bw7/to9dMOqUeCz8XCdgt5kpeakhzhP61RK89JQAe2ULCocbyjHa+e8jbzr7g72ng+xdo7CfCohdhzu3EWZ/Ilup9JXuNJHIOJaEK+E9T1qQILtaueynnyaIpdayMsVJwy8hg7Jg2RWr3pO+n4BmMpKsH9EmxTSc6/wM2bC/ZTxDOwTCVXriedqfD4PXbpARkSdKs1iOu29RXOWTQ44I1OT7LYpTP6xYudE3fiW0cgkECCRfziq/SiG5ejR3vwXxvi/yfFWw6oNVgy762H1u/r0/cAxcP6VOcbFvrQPad1N6wTyXHUlqeNJvJ4ty/ce3RTndDPpKxNFr4Ffso=; 5:5nAZFVjOriQVipRIRpznM/5Eel5Jz4m8r5JCIxJdnp/otKz9W7cW7SFXlAMH+QPyNL3ikHvxJeetwvLmxawt4sv6/hs5f0qp2SjggXZVBMMB0WIsALHWTtCwPwqqkdfuoIf91rSFrgtRdOen7rZvyGnXaBP3KMx0JjyzPZm7XM8=; 24:utciil+F8TyZx7APGRa+roRrVEa0U3OPN9G9sAfAy8rbcypquJpx71E8Iz8/2T882NT0ZwjgF2ayEeI+ZefAAq/A9HQg0KHimXXXgUT+pBQ=; 7:h6elkoOqQryQibXOHEP//wJwdqbHxekNG6F/m7Qa/SfGgoJ1P8rJ3hzfwni7NWpzr5BfAwgLZK+TVvJ60gAKvF933PoC6eYDK73oz08P3iXTq7hVvAaFB3jVn28dwrcE8OGcbossTWZ8xYQVEYOnKSJnfcuROOX9eqK9eGG3duso39GoDAYR0FGS0SjMT3Y2QpxY+jlAu+6PKp29h5oSC/LcJCoVO5tlo//oaAmrq2ZVHQ+j1FwD/VP/eyNNuxVk SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 16:06:58.1406 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1b0809be-b983-4090-b300-08d5328c39d4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB316 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes While working on the previous patch, I renamed variables whose type I changed to let the compiler help me find their usages, but I forgot to rename one back to its original name. This patch fixes it. gdb/ChangeLog: * varobj.c (struct varobj_dynamic) : Rename back to... : ... this. (varobj_get_num_children, varobj_update): Adjust. --- gdb/ChangeLog | 7 +++++++ gdb/varobj.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c7dbab5..3fdeae1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2017-11-23 Simon Marchi + * varobj.c (struct varobj_dynamic) : Rename + back to... + : ... this. + (varobj_get_num_children, varobj_update): Adjust. + +2017-11-23 Simon Marchi + * ada-varobj.c (ada_value_is_changeable_p): Change int to bool where applicable. (ada_value_has_mutated): Likewise. * c-varobj.c (varobj_is_anonymous_child): Likewise. diff --git a/gdb/varobj.c b/gdb/varobj.c index ce324b7..93b97f6 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -113,7 +113,7 @@ struct varobj_dynamic used to decide if dynamic varobj should recompute their children. In the event that the frontend never asked for the children, we can avoid that. */ - bool children_requested_ = false; + bool children_requested = false; /* The pretty-printer constructor. If NULL, then the default pretty-printer will be looked up. If None, then no @@ -839,7 +839,7 @@ varobj_get_num_children (struct varobj *var) const std::vector & varobj_list_children (struct varobj *var, int *from, int *to) { - var->dynamic->children_requested_ = true; + var->dynamic->children_requested = true; if (varobj_is_dynamic_p (var)) { @@ -1629,7 +1629,7 @@ varobj_update (struct varobj **varp, bool is_explicit) if (v->frozen) continue; - if (!v->dynamic->children_requested_) + if (!v->dynamic->children_requested) { bool dummy;