From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 21BB1385DC06 for ; Tue, 14 Apr 2020 13:31:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 21BB1385DC06 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3F3A9AE0D; Tue, 14 Apr 2020 13:31:55 +0000 (UTC) Subject: Re: [PATCH][gdb] Fix missing symtab includes From: Tom de Vries To: Simon Marchi , gdb-patches@sourceware.org Cc: Tom Tromey References: <20200327204948.GA23365@delia> <44300932-0e15-c3b6-9ce8-44e08dd5d8ef@suse.de> <93eaa135-a031-e3cf-9fd5-293b3fc437fe@suse.de> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: <7e769d78-bd5e-c43f-99e3-d37cd42a44c2@suse.de> Date: Tue, 14 Apr 2020 15:31:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <93eaa135-a031-e3cf-9fd5-293b3fc437fe@suse.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-30.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2020 13:31:58 -0000 On 30-03-2020 19:42, Tom de Vries wrote: > On 29-03-2020 23:44, Simon Marchi wrote: >> On 2020-03-29 11:56 a.m., Tom de Vries wrote: >>> diff --git a/gdb/psympriv.h b/gdb/psympriv.h >>> index 0effedc4ec..4317392149 100644 >>> --- a/gdb/psympriv.h >>> +++ b/gdb/psympriv.h >>> @@ -124,16 +124,26 @@ struct partial_symtab >>> { >>> } >>> >>> - /* Read the full symbol table corresponding to this partial symbol >>> - table. */ >>> + /* Psymtab expansion is done in two steps: >>> + - a call to read_symtab >>> + - while that call is in progress, calls to expand_psymtab can be made, >>> + both for this psymtab, and its dependencies. >>> + This makes a distinction between a toplevel psymtab (for which both >>> + read_symtab and expand_psymtab will be called) and a non-toplevel >>> + psymtab (for which only expand_psymtab will be called). The >>> + distinction can be used f.i. to do things before and after all >>> + dependencies of a top-level psymtab have been expanded. >>> + >>> + Read the full symbol table corresponding to this partial symbol >>> + table. Typically calls expand_psymtab. */ >>> virtual void read_symtab (struct objfile *) = 0; >>> >>> - /* Psymtab expansion is done in two steps. The first step is a call >>> - to read_symtab; but while that is in progress, calls to >>> - expand_psymtab can be made. */ >>> + /* Expand the full symbol table for this partial symbol table. Typically >>> + calls read_dependencies. */ >>> virtual void expand_psymtab (struct objfile *) = 0; >>> >>> - /* Ensure that all the dependencies are read in. */ >>> + /* Ensure that all the dependencies are read in. Typically calls >>> + expand_psymtab for each dependency. */ >>> void read_dependencies (struct objfile *); >> >> I don't think the "Typically" here is right. This is not a virtual function that can >> be implemented/overriden by sub-classes, it's a helper that sub-classes call, that calls >> expand_psymtab on all dependencies. > > Ack, comment updated accordingly. > >> As you probably saw, I renamed it to >> expand_dependencies to be more accurate (since it calls expand, not read). >> > > Ack, patch rebased. > >> But otherwise, I am starting to think that it's the right thing to to, to call read_symtab >> on the includer (top-level psymtab) in dwarf2_include_psymtab::read_symtab. To read in >> an include psymtab, we read in the includer. >> >> Following this, I also came to the conclusion that dwarf2_include_psymtab::m_readin should >> probably be removed. An include psymtab can't be read in on its own. It can be considered >> read in when its includer is read in. So it doesn't make sense to maintain a "read in" state >> separate from its includer. >> > > That makes sense to me. > >> Here's the version I came up with, if you want to get inspiration. >> > > I've integrated it into my patch and re-tested. > > Also, added test-case. And committed. Thanks, - Tom