From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47402 invoked by alias); 7 Jan 2018 05:33:29 -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 47371 invoked by uid 89); 7 Jan 2018 05:33:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 07 Jan 2018 05:33:25 +0000 Received: from ESESSHC006.ericsson.se (Unknown_Domain [153.88.183.36]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id E1.66.27591.321B15A5; Sun, 7 Jan 2018 06:33:23 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.36) with Microsoft SMTP Server (TLS) id 14.3.352.0; Sun, 7 Jan 2018 06:33:21 +0100 Received: from [100.94.228.101] (129.192.64.65) by AMSPR07MB309.eurprd07.prod.outlook.com (2a01:111:e400:802f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.1; Sun, 7 Jan 2018 05:33:20 +0000 Subject: Re: [RFA 1/6] Unify new_symbol and new_symbol_full To: Tom Tromey , References: <20180106002621.21099-1-tom@tromey.com> <20180106002621.21099-2-tom@tromey.com> From: Simon Marchi Message-ID: Date: Sun, 07 Jan 2018 05:33:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180106002621.21099-2-tom@tromey.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BN6PR11CA0070.namprd11.prod.outlook.com (2603:10b6:404:f7::32) To AMSPR07MB309.eurprd07.prod.outlook.com (2a01:111:e400:802f::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e35b4e37-f4c4-4c09-9fe9-08d5559029da X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020020)(5600026)(4604075)(4534040)(4602075)(4627136)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020);SRVR:AMSPR07MB309; X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB309;3:wZKfzv00ZhOO+s4QWXj+bVBoMuIBBdYPRMyPncbhqS8fmyMRgFAHY+qzYNfkdjHfa+QBM4Tb12KYWm7LjmTwUv/qymTgOJv2oZm4HsoX77ePu6ZlGaj6S8kVHbjucjJqpw7AoXzaKg9rfP9zDkmUswgbVkCvcx05aUMsKq1RObW2kFzCxSGe7QCL9rI/YkwC4SX5AWrXCsADBNYFpSE7cg/jLpjMi2fufWUYHMoGvEIc6hINezYuFmQd+Lr1aVV8;25:XjlyRr78bC/DZfbzbV8Uz/kabR2szyCeG0jF7rsjVYH4Mhq5pbd5302249pyJI4zhUr5VXwJTj2tPdY+aCRpxarcaeI4mCZz+CneLPDJVefnC48t8SsAUgXMtBNC/5ggM5USpU7kAoBciuIYzMnF+VgCYsbacmF5B1vclzgWkBn/9JBKB3PlyGkCyfEty1IBz//mrCsgSImgkkPBswNwn6elcEb/QmarpKPcGItiKyjXRU6hpEsgv+y8yqmRhrN3zolrqimzzaCSLB7g3+ew+G7CuZaJ+s7ksdokuDbwDDXMKpzq0eyqcOYMxosEvn7B5LAq/ajADCwM3kQRlXYRiA==;31:d3tN76UBeAc8l3IHP8IrAv2Pu8qX9BxNBpqOGfslaqVlOrqf4LWQtbhghwOuOApvlqmGWG/pg0dnJizUrYnvBLIPXz9RxkFLJVrTXGuOrPLFbh1p5YWmxlasDJOMkl4QeyJ4ZA4brSpyeIzrCtMrLFLJqaClHeCKUhRNAIazWwE2BzMixlEFPb+KEJ+fx2U1FlN+RHHlNdoQLt/2d4nm/D4/G9bgakoPxw2CpjnVNqQ= X-MS-TrafficTypeDiagnostic: AMSPR07MB309: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB309;20:oLdSrosVLJaL02muTQn94MrQb73cuV5/Pv+sfuZrNmEZwNyN2zwyzgtSxYNJ41a9FiXJGtqNnOhR5GStPGWqjPHXNpjj0GztRA5yjbMFUXdWKVtboLHIpTcwPAniIHNzYYDWYuEdwKRz1wwoZfrQpVYVUf2XFnVz0vQmrPlFauqGVyh8xeC6MkNQpF6JX+WI5aeA8oFDPaKzYcc02dEjGnH3nazCUm5BwF81lSkx1/LQHUFIhGm8exLU6r5E4beKZ/4ZaK8GM20TSk43dkVj+RTFDitanz5MvXprPySkTUPKF+CoCO3oZC8QbN7S5gAj/gsPQzvn66yScmQpiL28nhNpNzVAW6yQh93YdU3co5TTLbzaRM5YPBXEm3Ij/YDew76IF7eBYwJOXIElq2PxTUrlHwzuRNmbO2NL8/RPKiwBPJ2epi0NR51vNTKmKAfnrZRu3LnQNCQs+5Yj/kO68KE7wgn8trzL4NqZgTFXszyaxa3LsJSqr5M0YeQnslLM;4:1oHNw4hMsOxSq2WIgvprYKVynegC3atP+ZKpFhSaEm+RxhJgBkeoBJEh4VNnXF0lfV9c8+Vjw3HbRa3mRhovN5cNjuXQItl5ggEHIUpvJwGLMj0sEgwAMfV5PTgafWJojb26GdqTKyjnebmatbZC4YRpwuy95wi4OVvwlaEDmkrOMTxzXD17JthpjYPdwOPVjdA213ehY3PKHzolItiBg+1jATgb5HhgbTXsle9T8huUv4zW6ev+bKz8s/FDRGp5m4BFB+2QNdzlaG+cMiBNqt4A1I9ZuU81prlNZpqRGCvbPlpgos36QVgpQZuxX4Wz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231023)(944501075)(93006095)(93001095)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011);SRVR:AMSPR07MB309;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:AMSPR07MB309; X-Forefront-PRVS: 0545EFAC9A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6049001)(39380400002)(346002)(366004)(396003)(376002)(39860400002)(54534003)(377424004)(24454002)(189003)(199004)(23676004)(52146003)(2486003)(52116002)(59450400001)(386003)(6246003)(2906002)(53936002)(25786009)(76176011)(53546011)(50466002)(106356001)(105586002)(66066001)(65806001)(478600001)(65956001)(6116002)(3846002)(64126003)(47776003)(31686004)(97736004)(230700001)(305945005)(65826007)(36756003)(31696002)(68736007)(6666003)(49976009)(86362001)(2950100002)(83506002)(229853002)(16526018)(8676002)(81156014)(81166006)(7736002)(58126008)(316002)(16576012)(6486002)(8936002)(5660300001)(78286006);DIR:OUT;SFP:1101;SCL:1;SRVR:AMSPR07MB309;H:[100.94.228.101];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: =?utf-8?B?MTtBTVNQUjA3TUIzMDk7MjM6dCtYdHZTSm9LbTFRcEdYV1czOGNvZXVtTFMz?= =?utf-8?B?YjRoazhUMW80bWFNVkJ5MS9JVmRRSE0vSGswSjU1Tm9GNHhmbkhEcmdlbE5r?= =?utf-8?B?UEJPWHNIcXkxZDZJWVBUVFlFeG5PNEZ5WENTSmszNHJGSlBVMnRHc0lxN25X?= =?utf-8?B?clYyV0QvVVFINE9nTjhyc3hQYWUrNm45ekcwV0FTcytJaDNWT2xCTU9wZDVp?= =?utf-8?B?YWdyWEdjK09WWGVQRnhRbUpjRXlGcE55emY5TEhKVEVlSXU1eWZDdTVRWFZq?= =?utf-8?B?ZVppWXB2NmhqbFJyY2FnazlTMkFrRTFNaWhySlFacTljekZSSm4yb0lLcnQ5?= =?utf-8?B?VE1VRjZ5YnU2c2lrTGM2L2NVRGNrZ2tBY3E2MDl2WE1ZWnFYdkRZd2ZvaTYr?= =?utf-8?B?Wnc0TGl0REUwMUZ6VFZ0WmFPSHVKYW1Hd3A3TzRzd1R3SDVSQjhOYkpOck9z?= =?utf-8?B?dUl2aUp6b2d4S0JHVjNPYzA3WUpjK083MFZTYkRwY3NWYk1tSUVNQm1USE0w?= =?utf-8?B?cHlzRHNodFhEbjdodEdEMzN6ZTBMZTFia0pLZUtDS0w5WnN5aGNiZDl5QnpQ?= =?utf-8?B?TUMrSkZZRGdiTmFoNUgybzdOMEdGcGFnOXg0bUxpUzR1NkM2aDZnTFlyTWNt?= =?utf-8?B?Sms0eStjZFAxOEI4Mk9ER0E3SlhwSGpDNitST3IvS0JRWWhWdWtxaTEvYmln?= =?utf-8?B?Q3BBcUpHdjZWRHY2N0JEV2sveXJvdHpRWG1zbVRnN1VGYyt5eVV5OW5FSjF3?= =?utf-8?B?Um5WTFo3TGNDYnBaTEtwcFNCWW5wQmV1a1pqaGRRMVJrNlZ6aU5MVTZxeGVw?= =?utf-8?B?ckNsRS9KWjQvRHJKOE05UVc1eWtDNmhCT0tWRXV0MmM5NGsxUk4vTHFWS0Zq?= =?utf-8?B?ckU0ZHJRQ2psd3cyd0h6cTY3SlpnZUhQaGhUMkRWb053OEg4bzM5R1lwM09F?= =?utf-8?B?N2x3ZWZEbHRjUkdsdnJBdEtuNklNZ0x0OUVjeHZoTFZqNk5RTm5oQkJNSzAx?= =?utf-8?B?ZlV2SlNRZzNyb0oxUnhUZXVDMUJsclNtQlpxK1ExVktQQnF2K2FPRzRrQ25q?= =?utf-8?B?UkNMcVdydytsNG8rQ3YzL0hBaFExSXlnSGxISFdRQzE5VGF3eXh2ekpGeWU4?= =?utf-8?B?RGlpWXhsa1JEOE1XbXdscTdYNTJjdjJBd3N1ZlgzSnJScHJ6SzhISWxpS1dw?= =?utf-8?B?bjlzUTQvZFNhd2tmcWJWNHBRczJtejJyVFNyK0tiOGx6alFlY0hKZityYXQy?= =?utf-8?B?WnZqZHR0MzJBaWoraVJhS25xaFdGeHJ6dCs2Y2ZRRTNjOVYrWk5VdVQrZ1VI?= =?utf-8?B?TlBtZ09YUmZadzl0aHlpREFFNHk0dGNicmx5OTA1bUZsZTI0NVNER2ZhTGZo?= =?utf-8?B?MFUzRU5KK1NjcisxZjVzK3N5a3RFdGlvYWlqc0wwaWFQQjNOV3R0VEI0VVRi?= =?utf-8?B?Y3lwLzNmMUZhUlhQWDhoMDVycDQ1ZUxJRVdxSFM2bnJRR1lieEdqZGtFaHBj?= =?utf-8?B?Um43MHdtdUJOQWNqYXphUVdkYjVWd2tzeFd6RnBtQmFEaW95YnUyUzUxUlcr?= =?utf-8?B?TUM0MFhBTUE2VFVQMHovU2VrUGhjdkVrVGIzQ2hrK1gyb1dPMW8xQWRSbkZ1?= =?utf-8?B?blE0VVJ0b252TThSSnIyTnB4MGYySHNpbE9YNTdXQTVHRUIxSzh6WWQ3eWpD?= =?utf-8?B?dFlVbnp3cnk1QTZmOXdkaFB1KzVaY214dE9FM09IQnVoYVJjU3MyUWcrRzJR?= =?utf-8?B?U3NRWnpzVFk4MjZNMWhDcmZLSVJKVnhmRmxQdjFDQml1WU13WDlqbjNTbnEx?= =?utf-8?B?S1cwSFZDRTdGUHNaRzlWekhaanBJRGRIL2dQS0svV2JwU1JieFd5eDh6SU1O?= =?utf-8?Q?yItyGqTLbQ8Bs+0kT3vvRFiVw5Q1tw6?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB309;6:+41CE7q0LLyIZ5BbQtETjJd2To4hIEuyHWa5XuxB/kAOKcRDWP/BxCSkmuI70zPP4BoCZdpyWjkmHsvrA3Z8K3a7zAeJBPZUwfSX3Noo21w4PBPX0zembUU/JmYbk8T2UNgcOOv3uD3ys0pmXpA4h8QoTyk//8UbTlxU66+KkoBP31/eBoLDyQOnCHsjc77Xt0U3gSPlqR0QBr217i96wltBqFtPcYhFkj+9US0f+Z1lwNgmfzCADkru8vqExF0SuYHTX0fqaIxHeOd4JPnlIUb5uNaLWkZaEjLy4Q2c/ixQ1a6wNZK6AyfqlwLU47IuePlAflK9z4yi9m53VowOT7lZfvYUHZiwG8L8kZAeelc=;5:mGKr4BdeBkh3D38hzq0QH2Yx94KtifxllEo3yMg/fqn7TIa369M8pkr6Qg4O3pV8QTMd52YjQX6vEjUIIpWK+NL3CQTXLe/sGuY62H0lSJXAOdqr4oR0EoRgROJ03RKKQvZ0GhBUKtCbuaMbhUQ/J6QVq89Vyp9HAZNOz54kSKo=;24:5NHT9QLmUTAW0140R+DDBJ2jLZHdQHL3KMcBDr+GTsBGhmGs4YMDgGmO+5ol/JCE2iPAv4VwWZmAjB6XG0WnOwQrhqSDzIBA+XPvpBwXV4A=;7:NDHOr2+Iexjp8AvKRljb6AjEYWfFKWXRaMwuCkbi+UFNmE1FfGwzocd0+qpzR+aiqb0f/51rzpPYZZNd1PiwMK29P1iMMp3ZqlmiA5JeON2XvY95cqQ2zOdgOeCYeON4RASkP0zNrmAjxtYiLzSGAaJjQxXxJQVvjzRSuDSTO1yr0urB/3moe5Hielwtoi+3mcyqvVfGZL/YqKsefEDMQb+a9qk9IGER8GuCG4CxMu6tgAr420xQT6sbO4k2gRdy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2018 05:33:20.1450 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e35b4e37-f4c4-4c09-9fe9-08d5559029da X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB309 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes X-SW-Source: 2018-01/txt/msg00136.txt.bz2 On 2018-01-05 07:26 PM, Tom Tromey wrote: > This patch unifies new_symbol with new_symbol_full, replacing a > wrapper function with a default parameter. > > 2018-01-05 Tom Tromey > > * dwarf2read.c (dwarf2_compute_name): Update comment. > (read_func_scope, read_variable): Update. > (new_symbol): Remove. > (new_symbol_full): Rename to new_symbol. > --- > gdb/ChangeLog | 7 +++++++ > gdb/dwarf2read.c | 29 +++++++++-------------------- > 2 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index 24ccfe6882..5ad43d963a 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,10 @@ > +2018-01-05 Tom Tromey > + > + * dwarf2read.c (dwarf2_compute_name): Update comment. > + (read_func_scope, read_variable): Update. > + (new_symbol): Remove. > + (new_symbol_full): Rename to new_symbol. > + > 2018-01-05 Pedro Alves > > PR gdb/18653 > diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c > index a3028e5c52..92c4903241 100644 > --- a/gdb/dwarf2read.c > +++ b/gdb/dwarf2read.c > @@ -1862,10 +1862,7 @@ static struct compunit_symtab *dwarf2_start_symtab (struct dwarf2_cu *, > CORE_ADDR); > > static struct symbol *new_symbol (struct die_info *, struct type *, > - struct dwarf2_cu *); > - > -static struct symbol *new_symbol_full (struct die_info *, struct type *, > - struct dwarf2_cu *, struct symbol *); > + struct dwarf2_cu *, struct symbol * = NULL); > > static void dwarf2_const_value (const struct attribute *, struct symbol *, > struct dwarf2_cu *); > @@ -10831,7 +10828,7 @@ dwarf2_compute_name (const char *name, > but otherwise compute it by typename_concat inside GDB. > FIXME: Actually this is not really true, or at least not always true. > It's all very confusing. SYMBOL_SET_NAMES doesn't try to demangle > - Fortran names because there is no mangling standard. So new_symbol_full > + Fortran names because there is no mangling standard. So new_symbol > will set the demangled name to the result of dwarf2_full_name, and it is > the demangled name that GDB uses if it exists. */ > if (cu->language == language_ada > @@ -11104,8 +11101,8 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu) > > if (cu->language == language_go) > { > - /* This is a lie, but we already lie to the caller new_symbol_full. > - new_symbol_full assumes we return the mangled name. > + /* This is a lie, but we already lie to the caller new_symbol. > + new_symbol assumes we return the mangled name. > This just undoes that lie until things are cleaned up. */ > } > else > @@ -13731,8 +13728,8 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) > } > > newobj = push_context (0, lowpc); > - newobj->name = new_symbol_full (die, read_type_die (die, cu), cu, > - (struct symbol *) templ_func); > + newobj->name = new_symbol (die, read_type_die (die, cu), cu, > + (struct symbol *) templ_func); > > /* If there is a location expression for DW_AT_frame_base, record > it. */ > @@ -14287,7 +14284,7 @@ read_variable (struct die_info *die, struct dwarf2_cu *cu) > } > } > > - new_symbol_full (die, NULL, cu, storage); > + new_symbol (die, NULL, cu, storage); > } > > /* Call CALLBACK from DW_AT_ranges attribute value OFFSET > @@ -21183,8 +21180,8 @@ var_decode_location (struct attribute *attr, struct symbol *sym, > NULL, allocate a new symbol on the objfile's obstack. */ > > static struct symbol * > -new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu, > - struct symbol *space) > +new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, > + struct symbol *space) > { > struct objfile *objfile = cu->objfile; > struct gdbarch *gdbarch = get_objfile_arch (objfile); > @@ -21564,14 +21561,6 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu, > return (sym); > } > > -/* A wrapper for new_symbol_full that always allocates a new symbol. */ > - > -static struct symbol * > -new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu) > -{ > - return new_symbol_full (die, type, cu, NULL); > -} > - > /* Given an attr with a DW_FORM_dataN value in host byte order, > zero-extend it as appropriate for the symbol's type. The DWARF > standard (v4) is not entirely clear about the meaning of using > LGTM, this one can go in by itself I think. Simon