From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KE/CFpZaBWB+GAAAWB0awg (envelope-from ) for ; Mon, 18 Jan 2021 04:53:26 -0500 Received: by simark.ca (Postfix, from userid 112) id 579591EF80; Mon, 18 Jan 2021 04:53:26 -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.3 required=5.0 tests=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 CAE031E590 for ; Mon, 18 Jan 2021 04:53:25 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7824F3834410; Mon, 18 Jan 2021 09:53:25 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 082EF383440B for ; Mon, 18 Jan 2021 09:53:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 082EF383440B 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 23B90B73C for ; Mon, 18 Jan 2021 09:53:22 +0000 (UTC) Date: Mon, 18 Jan 2021 10:53:20 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Fix gdb.python/py-format-string.exp with -m32 Message-ID: <20210118095319.GA25904@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Hi, When running test-case gdb.python/py-format-string.exp with target board unix/-m32, we run into: ... (gdb) python print \ (gdb.parse_and_eval ('a_base_ref').format_string (deref_refs=True))^M @0xffffc468: {_vptr.Base = 0x80487e0 , a = 42, \ static a_static_member = 2019}^M (gdb) FAIL: gdb.python/py-format-string.exp: format_string: \ lang_cpp: a_base_ref with option deref_refs: deref_refs=true ... while with -m64, we have instead: ... @0x7fffffffd170: {_vptr.Base = 0x400910 , a = 42, \ static a_static_member = 2019}^M (gdb) PASS: gdb.python/py-format-string.exp: format_string: \ lang_cpp: a_base_ref with option deref_refs: deref_refs=true ... The vtable contains pointer entries which are 4-byte for -m32 and 8-byte for -m64, so it's not surprising the offsets (Deriv+8 vs. Deriv+16) differ. Fix this by allow Deriv+$decimal. Tested on x86_64-linux. Any comments? Thanks, - Tom [gdb/testsuite] Fix gdb.python/py-format-string.exp with -m32 gdb/testsuite/ChangeLog: 2021-01-18 Tom de Vries * gdb.python/py-format-string.exp: Allow Deriv+$decimal as vtable offset. --- gdb/testsuite/gdb.python/py-format-string.exp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp index 8163df7ad56..160e9019cda 100644 --- a/gdb/testsuite/gdb.python/py-format-string.exp +++ b/gdb/testsuite/gdb.python/py-format-string.exp @@ -534,6 +534,7 @@ proc test_deref_refs {} { global current_lang global default_pointer_regexp global default_ref_regexp + global decimal check_var_with_bool_opt "deref_refs" "a_point_t" check_var_with_bool_opt "deref_refs" "a_point_t_pointer" @@ -551,7 +552,7 @@ proc test_deref_refs {} { if { $current_lang == "c++" } { check_var_with_bool_opt "deref_refs" "a_point_t_ref" check_var_with_bool_opt "deref_refs" "a_base_ref" \ - "${default_ref_regexp}: \\{_vptr\[.\$\]Base = ${default_pointer_regexp} , a = 42, static a_static_member = 2019\\}" + "${default_ref_regexp}: \\{_vptr\[.\$\]Base = ${default_pointer_regexp} , a = 42, static a_static_member = 2019\\}" } } @@ -923,6 +924,7 @@ proc test_mixed {} { global current_lang global default_ref_regexp global default_pointer_regexp + global decimal check_format_string "a_point_t" \ "raw=True, format='x'" \ @@ -947,7 +949,7 @@ proc test_mixed {} { check_format_string "a_base_ref" \ "deref_refs=True, static_members=False" \ - "${default_ref_regexp}: \\{_vptr\[.\$\]Base = ${default_pointer_regexp} , a = 42\\}" + "${default_ref_regexp}: \\{_vptr\[.\$\]Base = ${default_pointer_regexp} , a = 42\\}" } }