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 51CF3385783F for ; Sun, 1 Nov 2020 21:44:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 51CF3385783F 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.221.27]) by mx2.suse.de (Postfix) with ESMTP id 5C18EAD2C; Sun, 1 Nov 2020 21:44:25 +0000 (UTC) Subject: Re: [PATCH] Fix Rust regression with -readnow To: Tom Tromey , gdb-patches@sourceware.org References: <20201101010053.19316-1-tom@tromey.com> From: Tom de Vries 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: <24823826-0175-277f-920f-90285488999f@suse.de> Date: Sun, 1 Nov 2020 22:44:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201101010053.19316-1-tom@tromey.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_STOCKGEN, NICE_REPLY_A, 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: Sun, 01 Nov 2020 21:44:27 -0000 On 11/1/20 2:00 AM, Tom Tromey wrote: > PR rust/26799 points out that a certain test case fails with -readnow. > This happens because, with -readnow, there are no partial symtabs; but > find_symbol_at_address requires these. > > This patch fixes this problem by searching all of an objfile's > compunit symtabs if it does not have partial symbols. > Hi, I've tested this both with native and readnow, and both test results look good. > Note that this test will still fail with .gdb_index. I don't think > that is readily fixable. > Doesn't fail for me with either cc-with-gdb-index or cc-with-debug-names target boards. FWIW, patch LGTM. Thanks, - Tom > gdb/ChangeLog > 2020-10-31 Tom Tromey > > PR rust/26799: > * symtab.c (find_symbol_at_address): Search symtabs if no psymtabs > exist. > > gdb/testsuite/ChangeLog > 2020-10-31 Tom Tromey > > PR rust/26799: > * gdb.rust/traits.exp: Remove kfails. > --- > gdb/ChangeLog | 6 ++++ > gdb/symtab.c | 59 +++++++++++++++++++++---------- > gdb/testsuite/ChangeLog | 5 +++ > gdb/testsuite/gdb.rust/traits.exp | 6 ---- > 4 files changed, 52 insertions(+), 24 deletions(-) > > diff --git a/gdb/symtab.c b/gdb/symtab.c > index b7aae1bed14..cff069730b3 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -3024,30 +3024,53 @@ find_pc_compunit_symtab (CORE_ADDR pc) > struct symbol * > find_symbol_at_address (CORE_ADDR address) > { > - for (objfile *objfile : current_program_space->objfiles ()) > + /* A helper function to search a given symtab for a symbol matching > + ADDR. */ > + auto search_symtab = [] (compunit_symtab *symtab, CORE_ADDR addr) -> symbol * > { > - if (objfile->sf == NULL > - || objfile->sf->qf->find_compunit_symtab_by_address == NULL) > - continue; > + const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (symtab); > > - struct compunit_symtab *symtab > - = objfile->sf->qf->find_compunit_symtab_by_address (objfile, address); > - if (symtab != NULL) > + for (int i = GLOBAL_BLOCK; i <= STATIC_BLOCK; ++i) > { > - const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (symtab); > + const struct block *b = BLOCKVECTOR_BLOCK (bv, i); > + struct block_iterator iter; > + struct symbol *sym; > > - for (int i = GLOBAL_BLOCK; i <= STATIC_BLOCK; ++i) > + ALL_BLOCK_SYMBOLS (b, iter, sym) > { > - const struct block *b = BLOCKVECTOR_BLOCK (bv, i); > - struct block_iterator iter; > - struct symbol *sym; > + if (SYMBOL_CLASS (sym) == LOC_STATIC > + && SYMBOL_VALUE_ADDRESS (sym) == addr) > + return sym; > + } > + } > + return nullptr; > + }; > > - ALL_BLOCK_SYMBOLS (b, iter, sym) > - { > - if (SYMBOL_CLASS (sym) == LOC_STATIC > - && SYMBOL_VALUE_ADDRESS (sym) == address) > - return sym; > - } > + for (objfile *objfile : current_program_space->objfiles ()) > + { > + /* If this objfile doesn't have "quick" functions, then it may > + have been read with -readnow, in which case we need to search > + the symtabs directly. */ > + if (objfile->sf == NULL > + || objfile->sf->qf->find_compunit_symtab_by_address == NULL) > + { > + for (compunit_symtab *symtab : objfile->compunits ()) > + { > + struct symbol *sym = search_symtab (symtab, address); > + if (sym != nullptr) > + return sym; > + } > + } > + else > + { > + struct compunit_symtab *symtab > + = objfile->sf->qf->find_compunit_symtab_by_address (objfile, > + address); > + if (symtab != NULL) > + { > + struct symbol *sym = search_symtab (symtab, address); > + if (sym != nullptr) > + return sym; > } > } > } > diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp > index d237b928720..73a75b08e54 100644 > --- a/gdb/testsuite/gdb.rust/traits.exp > +++ b/gdb/testsuite/gdb.rust/traits.exp > @@ -45,11 +45,5 @@ if {![runto ${srcfile}:$line]} { > > set readnow_p [readnow $binfile] > > -if { $readnow_p } { > - setup_kfail "gdb/26799" *-*-* > -} > gdb_test "print *td" " = 23.5" > -if { $readnow_p } { > - setup_kfail "gdb/26799" *-*-* > -} > gdb_test "print *tu" " = 23" >