From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id aR15BOu98F+xawAAWB0awg (envelope-from ) for ; Sat, 02 Jan 2021 13:39:39 -0500 Received: by simark.ca (Postfix, from userid 112) id 0596D1F0AA; Sat, 2 Jan 2021 13:39:39 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 962BF1E552 for ; Sat, 2 Jan 2021 13:39:38 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AF90A3844006; Sat, 2 Jan 2021 18:39:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF90A3844006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609612777; bh=8AVN66XE+9UB7Cmq3RwS2kb8H3RYuRACJiUHRadqEOA=; h=To:Subject:Date:References:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=azR33Mu1FZhQ52oUSkzCkHg5kme1/zvPeHJbJvKH51+T3W5VgqG+T1oDo9VJ+d6Ad B4+dm0S/QY7/wF8RguI92A+JZ9vIq6j5fkdHy10Wlm12JWT0nF01hcJncup8mgMi5h ND9Y/4GI1oIhOQ/WRzKwulqsbKHR+xVv2e4FSZbM= Received: from sonic301-22.consmr.mail.ir2.yahoo.com (sonic301-22.consmr.mail.ir2.yahoo.com [77.238.176.99]) by sourceware.org (Postfix) with ESMTPS id CA7D23858024 for ; Sat, 2 Jan 2021 18:39:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CA7D23858024 X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1609612774; bh=t8aJIt2JxGQI8xqSqxrLAqIZ7hsk9jSq91aBtkCUY/T=; h=From:To:Subject:Date:From:Subject; b=Kx6z8QSTcuNNU1Ce9Ei6sHBrZklQH9EPIgHo3ZyLbPcEhHDQNIOvK+q6b1yfXRThohUvImIrJApKAKyDO8dEuYSGakDs+ukK9LaBcX8A9vjHYxDj5cr1QRcQCiuCHV/JuyTwd2y2JjHmNeEnyTmIwim3zrcyoVTqtzN9roODj5IhaQrl+HCQVpCTi6YLHfGqdU2tUGMogMdwGQFKcagHJBOX55h3eSRGEEAvBrFabqqfEobjrtpL5t5pKiLqjIf2A5q1La6O/oCOGjiVY2Oo+a1a+puQftI/mLe/ELe2fge7xNWC4MnnZy9kBWdO7WV7AbFEIvn88LpmbT/IV+eJzg== X-YMail-OSG: lE_141AVM1n1OaFziP2QG_RN7TYdvTt5yeWbNMC1kElQJlokjjm_W3zWchttjcU FYIVj345lTNlk1nFnqe.ph3V2_iNRcKH29aNTAC26ZDd.8sqadg9q2AseXRGspk5cPKa5CQv_8B6 LtcuVmWTs2sklSotwOGpoEX2RkOfpZjMQvNSyVd27rCDsXZsMinpeSrsvin83KUjTqTY7i.QT1jQ wW9H1J_1Ryasww4FoYO_XMGdvvLxK30CHLxUAU.Xf9kTfQSVJuqcMCxdgOjslmqkRxvKiDUtkGxb JIR0vUubbdZikzJGBoFS1sI6uBATbpMiJ6mA.q4LnZND9VCrbKOMcQS6fsZtBnIKQpV6HBlp37ky Yd_uKL58YyWDc4u_UJcNsstyXKwfyDK9axrmBK3xRKTPXeV4V6XrvmclyMYgUWZZDZwlW_3oI8jT 8usPzby_7a5vfqC4a1FaFWvajgs5iY5hppyvkKBtH.vWSUWcEl8RdB6oAjT3LnrM2x0GjlasotN5 _BwHmjoB7vduHDo7Zx9VJZX3MnRXFQ_.m_pJ5.MUhP9ZRo3TSewSu9bR3zkxJuHJJGxQSSZGRRcB HHxx2h.oOA2YVi6icof.56umghx9GtJ4dHMhkdy381xRyJ6ZPoCr2gQObZzZ3PDzFFlDPM5n5PnA w0QOvUKiksWPZcQNGUw0GDfOTwdgMueWRHxXstWWsP0nYOWN2dOpVfzb0Qfyk2AveoetMpdrk3UE jHxy9rP8DVnCtXOmpjrhNONsFSVv1ovSr0sjkWLbvPCd9DEPo4bdQjbw.uc6QgmBgUC0EeNVlnvq UeUPM.yQ3DtoLFr63Bwo5GCpkgH0x1GJa5cIewoVsuMJGbYH5yo3LBnxqNlX4exrEv2RSLoaoJ.e .KrOVLLC92m4PDYnTvAXcNZwYwBN4pEIQzCHICWYi_3CSeHntxNMVYSJxxAIRVEJZliNFaIAqDu1 0TwEWR50GDhhz.6gsS9V1rtT3vxTPxt8Qk7ZHwR7ddiYcEIIJFSFjOxD3YlBS9Q.vwxynspDsISb BUBgRdONa_YW0TX8uW43UrymqON9j4zHUOf62eKYlGceyE.5ZTxVTme7XBeMpiJPi0n91XdQJ1CP VDa9bgq_KwiNOrqwX0eYH8Hs.F8VNK5kaBbWy1_U_glb3sabtxSyXSJT31FMn6cF4Q_hziKHKtKD XfKT5ljkpm0jSEMtUXaKjICV7xCOonaObX6uMI99FTMYTklgiViRNZcx4WHrjeYuuCglIAKpY7NM Kr6hoC2nauSudRdepR35oKfEp0LZMvTN5ah9wdVEYIpUKqiTm1ADIXUyfXqmU.7QeUpEFYXE.bej i8XguJOw.iNiUOS6AFxzAWe.wkDvIXBx3m0dag2oZ88xfBZq3SijgnUZ6Kke3zol5kpvL3qwycsD uc2Dz03LIlFihr8TXEIZOAhLLUbnSrWn.zF5s70LLAJZ83_Qs8PFyeuq_FzuKMCQlCF1VsaW8fkl BVm76j.KZbt5r.0ru2S.U4OLaQdxnJF4.f4lHMBHrOWA6A_qbc2JynhP6ye_aU9RdSbD2QMZ32t4 yQyz4LlqLP3Jdq2kU7I3_dE87f0skv17uSPXW3uSXeYU_bIRAn15gE87NoEZG0jo3a9KcbBn25aT mbZThHkXjhDsGOYF7.rRCpkogV8plNjhbXbXSlnWRL2EG_e2nhpC6Maa_vPl90Z4WDzf5jpFqhVW reCY2YESMwd16ju_rPKw6ekKQyxBnQsSwv66vHNe1ceRziJmbzhBKffSSborHdLaz06QpiAtbCmg qDJw5qdi84mm2sgetvDkl4OdiwQhKvoq2ci05YlP1ZA9BmrIPuBxmYvZboldY4jVR6t9iBqa2L8n lGfiYG5lWDM6wTk7DtfbSyu6abMrl207uNzc0.jRu9bwcYkaBjyVkOZDEj5B0j1xuLiyJyeaQrxT oq0_54037Ggcf227ATsCVLVsKwfT3dwh1ezlKte.WEQwhMmfgawm3uKeucRdryPe978casD8rD3T 2TNDbywcLXlgcotPTDSL6z3Tzfy1ecZtAffbeZ9p5i0bUadtLuCbVmCHGSNUgqZalkT.HClOjQcn bSwhk01l3rR3X0Po50YkkRjzrfHGrSxBzpFecVH6BOyQeQvG_Pk1WfetvOxJ3v8Yo3NaWx8LeU_m ECWuz_wE.W3Osm6lJNWmgmQTLSC8ZjuDsmSv7S8Xk14SHSUdbPhTc.3ygd3E0wndR7Cwbxsa95tt 6..asYDDCDEgly8RNp_jOtdGzELCoHTxx2lJz0F2CJvJI8wMIvi00MqaYIZ8OmF0LfNVCQR8PHpt MKDiGseDdFROpfw1w2TIAj_itKgLfZbfxyGrTBl.6Gx_p_o1ZFjHyAmgPsSjmEqCQGdPa_vDm9hS QWXNRNhbfmbBZ9uA1ordNsnyBDZBNVvwz71NC6Ob6jUb.EqVU1l1Xrx1lgogymEdN8JcFzA-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.ir2.yahoo.com with HTTP; Sat, 2 Jan 2021 18:39:34 +0000 Received: by smtp409.mail.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID a0089a7d9dc5f4ea2ddd0d9dcc2cf2c8; Sat, 02 Jan 2021 18:39:30 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [OBV] [PATCH] Fix pretty printer of main_type.flds_bnds.bounds Date: Sat, 2 Jan 2021 19:38:52 +0100 Message-Id: <20210102183852.2029-1-ssbssa@yahoo.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Antivirus: Avast (VPS 210102-0, 01/02/2021), Outbound message X-Antivirus-Status: Clean References: <20210102183852.2029-1-ssbssa.ref@yahoo.de> 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: , From: Hannes Domani via Gdb-patches Reply-To: Hannes Domani Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" I will push this under the obvious rule. In struct dynamic_prop the members kind and data were rename to m_kind and m_data. And flag_upper_bound_is_count is actually in bounds directly, not in its high member. gdb/ChangeLog: 2021-01-02 Hannes Domani * gdb-gdb.py.in: Fix main_type.flds_bnds.bounds pretty printer. --- gdb/gdb-gdb.py.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in index 3f959c7c62f..2b1c7ded4b6 100644 --- a/gdb/gdb-gdb.py.in +++ b/gdb/gdb-gdb.py.in @@ -183,17 +183,18 @@ class StructMainTypePrettyPrinter: def bound_img(self, bound_name): """Return an image of the given main_type's bound.""" - b = self.val['flds_bnds']['bounds'].dereference()[bound_name] - bnd_kind = str(b['kind']) + bounds = self.val['flds_bnds']['bounds'].dereference() + b = bounds[bound_name] + bnd_kind = str(b['m_kind']) if bnd_kind == 'PROP_CONST': - return str(b['data']['const_val']) + return str(b['m_data']['const_val']) elif bnd_kind == 'PROP_UNDEFINED': return '(undefined)' else: info = [bnd_kind] - if bound_name == 'high' and b['flag_upper_bound_is_count']: + if bound_name == 'high' and bounds['flag_upper_bound_is_count']: info.append('upper_bound_is_count') - return '{} ({})'.format(str(b['data']['baton']), ','.join(info)) + return '{} ({})'.format(str(b['m_data']['baton']), ','.join(info)) def bounds_img(self): """Return an image of the main_type bounds. -- 2.29.2