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 B59BA385BF81 for ; Wed, 8 Apr 2020 11:11:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B59BA385BF81 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 3EB5FAF3E; Wed, 8 Apr 2020 11:11:56 +0000 (UTC) Subject: Re: [PATCH][gdb/symtab] Find filename in shared psymtab From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey References: <20200408110321.GA10759@delia> 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: Date: Wed, 8 Apr 2020 13:11: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: <20200408110321.GA10759@delia> Content-Type: multipart/mixed; boundary="------------5A5D5FBCF7ACE13AFE75473D" Content-Language: en-US X-Spam-Status: No, score=-31.3 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: Wed, 08 Apr 2020 11:11:59 -0000 This is a multi-part message in MIME format. --------------5A5D5FBCF7ACE13AFE75473D Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 08-04-2020 13:03, Tom de Vries wrote: > Hi, > > When running test-case gdb.ada/dgopt.exp with target board > unix/-flto/-O0/-flto-partition=none/-ffat-lto-objects and gcc-8, gcc-9 or > gcc-10, and the tentative fix for PR25700 ( > https://sourceware.org/pipermail/gdb-patches/2020-April/167451.html ), we run > into this regression: > ... > (gdb) list x.adb:16, 16^M > No source file named x.adb.^M > (gdb) FAIL: gdb.ada/dgopt.exp: list x.adb:16, 16 > ... > > The reason for the failure is that without the tentative fix for PR25700, we > have an unshared psymtab: > ... > { psymtab gdb.ada/dgopt/x.adb ((struct partial_symtab *) $hex)^M > readin no^M > fullname (null)^M > text addresses 0x0 -- 0x0^M > psymtabs_addrmap_supported yes^M > globals (none)^M > statics (none)^M > dependencies (none)^M > }^M > ... > and a shared psymtab (with user field set): > ... > { psymtab gdb.ada/dgopt/x.adb ((struct partial_symtab *) $hex)^M > readin no^M > fullname (null)^M > text addresses 0x0 -- 0x0^M > psymtabs_addrmap_supported yes^M > globals (none)^M > statics (none)^M > user @0x159a ((struct partial_symtab *) 0x37b57c0)^M > dependencies (none)^M > }^M > ... > > The tentative fix for PR25700 removes the unshared psymtab. > > Then when trying to find a psymtab matching x.adb in > psym_map_symtabs_matching_filename, we run into this continue for the shared > psymtab: > ... > for (partial_symtab *pst : require_partial_symbols (objfile, true)) > { > /* We can skip shared psymtabs here, because any file name will be > attached to the unshared psymtab. */ > if (pst->user != NULL) > continue; > ... > and consequently cannot find the file. > > Fix this by not skipping the shared symtab in > psym_map_symtabs_matching_filename. > > Build and reg-tested on x86_64-linux. > > The test-case passes on master, starts failing with the tentative patch for > PR25700, and passes again with this patch. > Oops, now actually with test-case, and ChangeLog entries added. OK for trunk? Thanks, - Tom --------------5A5D5FBCF7ACE13AFE75473D Content-Type: text/x-patch; charset=UTF-8; name="0004-gdb-symtab-Find-filename-in-shared-psymtab.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0004-gdb-symtab-Find-filename-in-shared-psymtab.patch" [gdb/symtab] Find filename in shared psymtab When running test-case gdb.ada/dgopt.exp with target board unix/-flto/-O0/-flto-partition=none/-ffat-lto-objects and gcc-8, gcc-9 or gcc-10, and the tentative fix for PR25700 ( https://sourceware.org/pipermail/gdb-patches/2020-April/167451.html ), we run into this regression: ... (gdb) list x.adb:16, 16^M No source file named x.adb.^M (gdb) FAIL: gdb.ada/dgopt.exp: list x.adb:16, 16 ... The reason for the failure is that without the tentative fix for PR25700, we have an unshared psymtab: ... { psymtab gdb.ada/dgopt/x.adb ((struct partial_symtab *) $hex)^M readin no^M fullname (null)^M text addresses 0x0 -- 0x0^M psymtabs_addrmap_supported yes^M globals (none)^M statics (none)^M dependencies (none)^M }^M ... and a shared psymtab (with user field set): ... { psymtab gdb.ada/dgopt/x.adb ((struct partial_symtab *) $hex)^M readin no^M fullname (null)^M text addresses 0x0 -- 0x0^M psymtabs_addrmap_supported yes^M globals (none)^M statics (none)^M user @0x159a ((struct partial_symtab *) 0x37b57c0)^M dependencies (none)^M }^M ... The tentative fix for PR25700 removes the unshared psymtab. Then when trying to find a psymtab matching x.adb in psym_map_symtabs_matching_filename, we run into this continue for the shared psymtab: ... for (partial_symtab *pst : require_partial_symbols (objfile, true)) { /* We can skip shared psymtabs here, because any file name will be attached to the unshared psymtab. */ if (pst->user != NULL) continue; ... and consequently cannot find the file. Fix this by not skipping the shared symtab in psym_map_symtabs_matching_filename. Build and reg-tested on x86_64-linux. The test-case passes on master, starts failing with the tentative patch for PR25700, and passes again with this patch. gdb/ChangeLog: 2020-04-08 Tom de Vries PR symtab/25801 * psymtab.c (psym_map_symtabs_matching_filename): Don't skip shared symtabs. gdb/testsuite/ChangeLog: 2020-04-08 Tom de Vries PR symtab/25801 * gdb.dwarf2/imported-unit.exp: Test that we can get imported_unit.c in "info source" output. --- gdb/psymtab.c | 8 +++----- gdb/testsuite/gdb.dwarf2/imported-unit.exp | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/psymtab.c b/gdb/psymtab.c index d952f453d9..5e4e7d116f 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -157,17 +157,15 @@ psym_map_symtabs_matching_filename for (partial_symtab *pst : require_partial_symbols (objfile, true)) { - /* We can skip shared psymtabs here, because any file name will be - attached to the unshared psymtab. */ - if (pst->user != NULL) - continue; - /* Anonymous psymtabs don't have a file name. */ if (pst->anonymous) continue; if (compare_filenames_for_search (pst->filename, name)) { + while (pst->user) + pst = pst->user; + if (partial_map_expand_apply (objfile, name, real_path, pst, callback)) return true; diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit.exp b/gdb/testsuite/gdb.dwarf2/imported-unit.exp index d7b3d4c539..32a9abf620 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit.exp @@ -186,6 +186,12 @@ if { $psymtabs_p } { unsupported $test } +gdb_test "l imported_unit.c:1" \ + "1\timported_unit.c: No such file or directory\." + +gdb_test "info source" "\r\nCurrent source file is imported_unit.c\r\n.*" \ + "info source for imported_unit.c" + # Sanity check gdb_test "ptype main" "= int \\(void\\)" --------------5A5D5FBCF7ACE13AFE75473D--