From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 7FAC93854568 for ; Mon, 28 Nov 2022 23:01:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7FAC93854568 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=us.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=us.ibm.com Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ASMQcOJ035727; Mon, 28 Nov 2022 23:01:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : from : to : cc : date : in-reply-to : references : content-type : mime-version : content-transfer-encoding : subject; s=pp1; bh=wXttnwxE+Qnt/LY7kYLtHN5moA+wuBPWxR88Zc7lC0w=; b=S+4Werj3DT+bom6fdVgiXVw4n87+YnS7GzkJunmMi/c37lfg2FkPTL1Z7Pp7hnmUR2LX ju30zvoYJkDGcIDZc2WlMGaIh2lKEvz8/AFkJ3BGbJ2LNtdshEdq5OOZS9bBapqBetnd LYPR3yRDUV+4i8Mq4DtpisY9ZBKt26OcNmkSm13MoJkISfpw1qc1qVekxQcoEbxPX/UP 0yncqZv+ig9TwEgJEapntHf7gU8qsRGnVLCsvBaOf0j1dr3nvP3fhZbIfqOtaj8x/p1w d5Gp2qvtrgc8Zla88ssn74xO19ur7fNHw7LRki5tp4fg5HbKQ4FSfEo5SIyrwsTrFtR2 vg== Received: from ppma02dal.us.ibm.com (a.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.10]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3m3vnpp79r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Nov 2022 23:01:36 +0000 Received: from pps.filterd (ppma02dal.us.ibm.com [127.0.0.1]) by ppma02dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 2ASMnveP028752; Mon, 28 Nov 2022 23:01:36 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma02dal.us.ibm.com with ESMTP id 3m3ae9ckk2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Nov 2022 23:01:36 +0000 Received: from smtpav05.dal12v.mail.ibm.com ([9.208.128.132]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2ASN1eYn9700052 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Nov 2022 23:01:40 GMT Received: from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8177358052; Mon, 28 Nov 2022 23:01:34 +0000 (GMT) Received: from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0BB1658065; Mon, 28 Nov 2022 23:01:34 +0000 (GMT) Received: from li-e362e14c-2378-11b2-a85c-87d605f3c641.ibm.com (unknown [9.163.52.7]) by smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 28 Nov 2022 23:01:33 +0000 (GMT) Message-ID: <79e6af35f8f7731809833267bdbeb5f1a80a5672.camel@us.ibm.com> From: Carl Love To: Tom de Vries , gdb-patches@sourceware.org Cc: Ulrich Weigand , Tom Tromey , Will Schmidt , cel@us.ibm.com Date: Mon, 28 Nov 2022 15:01:33 -0800 In-Reply-To: References: <20221128162134.20424-1-tdevries@suse.de> <3d15ada9-ea26-e77a-26ed-5860bb83c113@suse.de> <42f0be03aa35e0f6163493ab57cd049b83db47a2.camel@us.ibm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-18.el8) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: lIqHakwzw9TrYVEnriKTNMmD_lUrFcP7 X-Proofpoint-GUID: lIqHakwzw9TrYVEnriKTNMmD_lUrFcP7 Subject: RE: [pushed] [gdb/testsuite] Fix gdb.ada/out_of_line_in_inlined.exp for ppc64le X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-28_17,2022-11-28_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 clxscore=1015 mlxlogscore=674 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211280162 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tom: On Mon, 2022-11-28 at 23:09 +0100, Tom de Vries wrote: > Yes, that also works for me as well as $bkptno_num_re which I > mentioned > > in my previous email work for me. I guess my preference would be > > $bkptno_num_re if it also works for you. > > That one doesn't work. As mentioned in the comment, it attempts to > match: > ... > # A regular expression that matches a breakpoint hit with a > breakpoint > > # having several code locations. > > set bkptno_num_re "$decimal\\.$decimal" > ... > in other words, "1.1" and in my case there's only one code location, > in > other words, "1". Yea, right. So I think we are down to the following patch that works on my Power 10 with no regressions. It sounds like this one works for you as well. Carl ------------------------------------------ Additional Fix for gdb.ada/out_of_line_in_inlined.exp for ppc64le The command to set the breakpoing on foo_o224_021.child1.child2 with Power 10, Fedora release 36 (Thirty Six) gives the following output: (gdb) break foo_o224_021.child1.child2^M Breakpoint 1 at 0x10011870: foo_o224_021.child1.child2. (3 locations) (gdb) run Starting program: ...gdb.ada/out_of_line_in_inlined/foo_o224_021-all Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Breakpoint 1.1, foo_o224_021.child1.child2 (s=...) at ...gdb.ada/out_of_line_in_inlined/foo_o224_021.adb:27 27 Do_Nothing (C); (gdb) FAIL: gdb.ada/out_of_line_in_inlined.exp: scenario=all: run to foo_o224_021.child1.child2 The issue appears to be that gdb prints the breakpoint number as 1.1 instead of the expected value of 1. It appears this is due to a compile optimization resulting in two breakpoints. This patch fixes the issue by accepting both breakpoint numbers. This patch has been tested on Power 10. --- gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp b/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp index 621b04e179b..5698a0632a1 100644 --- a/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp +++ b/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp @@ -34,7 +34,7 @@ foreach_with_prefix scenario {all minimal} { gdb_run_cmd gdb_test "" \ - "Breakpoint $decimal, ($hex in )?foo_o224_021\\.child1\\.child2 \\(s=\\.\\.\\.\\).*" \ + "Breakpoint ${decimal}(\\.$decimal)?, ($hex in )?foo_o224_021\\.child1\\.child2 \\(s=\\.\\.\\.\\).*" \ "run to foo_o224_021.child1.child2" set opt_addr_in "($hex in)?" -- 2.37.2