From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2056.outbound.protection.outlook.com [40.107.20.56]) by sourceware.org (Postfix) with ESMTPS id 3B12F3858D33 for ; Wed, 8 Nov 2023 11:59:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B12F3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3B12F3858D33 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.20.56 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1699444779; cv=pass; b=MONYaNHLMEXb22UrV8UDG7dUWMUMqsxytGp9HcBoTXi7Mu9Za/jsfgraWOM+lsYnM+RzW7kXgqqFS1GSfs4AE214xfeokA8yBDo95hCJTzsxkWjuysU1mM5k7YVXza8kcKdBK6HG4eMyQtkccVnCjmQR9O6BDvDMjqnWxChvzxo= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1699444779; c=relaxed/simple; bh=cnf7DsZNJBl4tgqPo1B79Z4/BdOjUlW04eKA0b1rfVs=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:Subject:To:From: MIME-Version; b=MHYxSePcZsvxhj2FObDEXJu7IYG/BIHXR1dQkyhPxOHkSo9kUXhnZUvhg5JUv7uEPO8uYzfzEirAhACsS1Z/p7fh7PslbD3fxXr7Rmcd8DGtlUuaUtNzcwAJCrkgRR7VunIqqz8PqJHrYCjGLAK/T49zhUo+BwS3UT9SkmAPmaQ= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=HjuJVL4Q56Q335SBrDEoQU+C1OS2dZwdUYZiBgcuMfZQy6CaxLJ8oYE5qKq3fdSaxWlabl6WkMsYELhORa3bWvNvxQwic0b8t5Qv4eWpNECy/NRC3xjucRw6Q3ds7tt/aW2TFit13XS9NAw9iHaAXHvXueFoe7RNm59num8bj81ao0rJFYjTLl4wG4pQ75zkCuRyWZ2qw1WrqHX++c+PbDIB75r8oGxErEoLphqUXA7ocRkv9vFLflZTa51BBBaT03D8BdCa0PBI7DHO3xtS0OcShvSljf2SR7plYN7Dp2WcLf578v+PkroLeot0Q/frgd3wV/rWIZemo6kCHciQcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2PYGAqoYJOin9A06LvaphnxKkabUr89nXZ+ojdF5REw=; b=Q0DTIPZ9LfKRKQwRnumwQw+pq56zOqesIcMUXnadPZ5/igYdvYP8Y5EbwdRrBGbDomnnfIE4p+z2Bd//rezMEKt4MFNgelylF+r2yAJ5jJku8TjMJoCGn7qLskZy+qUDfUMl8caVx+xk6EqkgvtTITFOseAzDltowIv/CwJ8scSQ909LfLBmHwoEVXrOb6kRU0gnPrrkRgIMFyxTqRniRp65Sst6A26q/nr3NyYx1h8xoFOvvW/Yh+g22grI/9FWHzZ1t07sk3vQC0ciq3cIzdp2RhDGuuzMAjoQff91E4bxuppO6wvzr4Kb5WvAcxyr4GaOUDdSO19Yj7dLinY3bg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2PYGAqoYJOin9A06LvaphnxKkabUr89nXZ+ojdF5REw=; b=Kc19ToM+zzyKnpFVSpiJZuQD22fFhYqb6kxiXgyGOyO1wFUoQ3B9ulNF4n2c8SaNbFgvCTLGkp/jeTOsAK+UXMFQf3cw8MA/Uh3ZNTAtPvQbInfqHxCPqP34KIokjaCp24CmBo/VaFejYl2qPjQ8VJyJxKxPwgsJdGQ5MxNZsb0= Received: from DUZPR01CA0063.eurprd01.prod.exchangelabs.com (2603:10a6:10:3c2::13) by DBBPR08MB10385.eurprd08.prod.outlook.com (2603:10a6:10:52a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Wed, 8 Nov 2023 11:59:34 +0000 Received: from DB5PEPF00014B8A.eurprd02.prod.outlook.com (2603:10a6:10:3c2:cafe::75) by DUZPR01CA0063.outlook.office365.com (2603:10a6:10:3c2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.29 via Frontend Transport; Wed, 8 Nov 2023 11:59:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5PEPF00014B8A.mail.protection.outlook.com (10.167.8.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.16 via Frontend Transport; Wed, 8 Nov 2023 11:59:34 +0000 Received: ("Tessian outbound 7671e7ddc218:v228"); Wed, 08 Nov 2023 11:59:34 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 085169642a26e61f X-CR-MTA-TID: 64aa7808 Received: from bf5dc6c4f196.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E189A2FF-2215-417B-9D82-4647972A5E5B.1; Wed, 08 Nov 2023 11:59:28 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id bf5dc6c4f196.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Nov 2023 11:59:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TXpmLkE/67/NqDd4e0teNCxGUwQb3Xp79Pq7F94AFWVcA34XhAAb4YbsrV5RjOvj8LrY3TeqAZAZnL9SzyNVfa+mrtQJW3AADrqvsQmgGGfVuJma7b3A0cu2xMqss/Fn5EXA/1yyTV7SOEvDeIp0nvYsS2Q1fx/uxTiR498/w8ef6/wYoC/1KeeiKy9wBAtEif2oPHAsOH34a5Eq2BSBAhPxXzn0yEL0LeVyr4rndSvrVQyyhv0085XN39fzcXNo/dJl3pG4XHQ9Pm3/z/u30OpaiKbcPTD88wEVYEjc/zcv1h4vgNVaWXYqHFKzqNOmcpLo04XOz0vpBYn8fBUECQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2PYGAqoYJOin9A06LvaphnxKkabUr89nXZ+ojdF5REw=; b=koMVbE2TzdY+V2It/MUT5HeqqZNXXGk5uRMIgmUaXgl4pVPQ/oFrfR1YdXlljC3TnlHmXaL7MW0S0i7lJKFueCsUCthXp4qH5YYaRx0HphvAYlvHDEvAp+y0ruGbqxj+6Se1YPqRyKUnYn40jAxO8zFMgTNqOcm+/NcwAoIncVuqohvpmcqsZC16TyBcZqohrncff+O0Me41HcbjhfLlAEgOpZtJ+Kfpe9dFW0cvGHU8YPSuerThLnR/N0mzFzYMnge2wfV82M5uKBNpht9eENWwTvoPpwiOhNQdwLVulCYkitbbRIoRpKpWEp0zytuKdqx7cCKM4x5l2UQdjcaCPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2PYGAqoYJOin9A06LvaphnxKkabUr89nXZ+ojdF5REw=; b=Kc19ToM+zzyKnpFVSpiJZuQD22fFhYqb6kxiXgyGOyO1wFUoQ3B9ulNF4n2c8SaNbFgvCTLGkp/jeTOsAK+UXMFQf3cw8MA/Uh3ZNTAtPvQbInfqHxCPqP34KIokjaCp24CmBo/VaFejYl2qPjQ8VJyJxKxPwgsJdGQ5MxNZsb0= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB3919.eurprd08.prod.outlook.com (2603:10a6:803:c4::31) by DU0PR08MB8206.eurprd08.prod.outlook.com (2603:10a6:10:3b3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Wed, 8 Nov 2023 11:59:26 +0000 Received: from VI1PR08MB3919.eurprd08.prod.outlook.com ([fe80::3e05:d9f5:3a1c:4b2f]) by VI1PR08MB3919.eurprd08.prod.outlook.com ([fe80::3e05:d9f5:3a1c:4b2f%5]) with mapi id 15.20.6954.028; Wed, 8 Nov 2023 11:59:26 +0000 Message-ID: <586ff3e3-f439-4db9-9801-b3cebf663725@arm.com> Date: Wed, 8 Nov 2023 11:59:24 +0000 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] Powerpc, fix for test gdb.base/unwind-on-each-insn.exp Content-Language: en-US To: Carl Love , gdb-patches@sourceware.org, Tom Tromey Cc: Ulrich Weigand References: <28eb1ebbaad9ad0a114d628e79072a0320c659f5.camel@linux.ibm.com> From: Luis Machado In-Reply-To: <28eb1ebbaad9ad0a114d628e79072a0320c659f5.camel@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: LO3P123CA0006.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:ba::11) To VI1PR08MB3919.eurprd08.prod.outlook.com (2603:10a6:803:c4::31) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: VI1PR08MB3919:EE_|DU0PR08MB8206:EE_|DB5PEPF00014B8A:EE_|DBBPR08MB10385:EE_ X-MS-Office365-Filtering-Correlation-Id: 35d2b4bf-1d23-4c3d-6dad-08dbe0522cdc x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jC8bVARx42vS5R6PG5d9PsElEo18hzB9sZy4cITTrJF91VKkMSj0cFv2oQ97Fhg16TBcyKxPzuonxKBdUHYluPiL0tehhdbZw0Y7iEA4QzrOBRYwmU5PJvSTmz3DrPY9FvZMMk584X2PQsPlJdvUhWc85KeQW8qJ0CZEtOweTuCrAFD0dJkVfbfn3g4rCQsbqAjP4uKqVtWVh42xvCXXgfWZYK0j0Dr0jDspos7HYtxU3IDoJs+KJNsmRVOV4YNHB9mfhO7JPKm7jnHkNxEZC1mVlsnhewKo3d+ilwgjN+zv3xHxVasCAjjmvxdyaXObhWNt/6/Ljzfr5W65dnARFWUed2VbOX6JNdtzZaMXut1S+5br352FjWDBtXG7cc2NnffxWKC5mTIihXAB8xyWauZmXEEvSlBA5rF6/S6ywhvYC14oUO0K1e188BmsTgbzGFbA+l0onEINWDaaukur+Pv2HfvOuSr4RjRHGIiyIjHVLHJZSJATWD+2xBe2HN9DD3VxG8cSs/BkBZZOF4BEBU6Ap1ISn8ZEwRFwZLfsQpsuGa9A2nD8qXnq6gPJRR9sc0O1ZQdDT1YSDJBO4pYaV2TezusDQgNGqeQmTSZVmNYfaB3ZUTmtXT9+N0bUpgRKjEiota2T/7LUf+y+3HJbyQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR08MB3919.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(366004)(396003)(376002)(346002)(136003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(2906002)(2616005)(6486002)(53546011)(478600001)(6512007)(66556008)(6506007)(83380400001)(26005)(66946007)(5660300002)(41300700001)(44832011)(8676002)(110136005)(8936002)(4326008)(66476007)(316002)(36756003)(38100700002)(86362001)(31696002)(66899024)(84970400001)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8206 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5PEPF00014B8A.eurprd02.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: a0daac57-6728-43bd-70f8-08dbe0522799 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QzD83mYbq5VNdrHEu2FlHBsVHCMF/IqOAvp3D5tyAZ9C1tp/nOQWLquRcRtkmI9rhEyLieim8P9IC8lQ82VgmdCUXY7z3xhIEGKUO78DjrutTH5JGIE89Mxpmap2wyjKjS+ZiAAQ537/sIgeRPzHbNNcGXjH0VpXhqnmdNut3NsQC9DI6cvslUfkPYIW7WRhx3noDXMm1UixCKkwu68TE8RTYQGn60ysjbsFlUgrKF4weBZBiwkKaNJ8B3BLF/8CIILvtkNk0QgWdFa2OT66fjwHEA1OS/YXeIl/sLc+N5/jTBAT/g4o5exrk591opwbdqX6qE/rEZFzzsWUe9jHqi83QWqdzR2ZCTP+auQ5Hc8+/lPVzDcuRymgQxgOWecWFNC1nhWYha3Pbj7oB8ufsEEHbypmSpOSIPZ9SZyJjhc9d91nu9cHgZf0rwjpuLbJO7u18cXh0B+kNvdduyJpe3MQ9UtIbIW24vjOZdXbtx6QVdbMbHWOxteMTWXdssgii6KnWvV3BhfCQ3Bfv0FH+UkX2htq3bmlMrOrdgQ7kG0vHenj67QUtNOtE88u3d5wWlyjBc3QfLOnGuN7Qxj09BSimr1vTuuXPQ9+x4yHEadUEiKFlZIM9Mg6WbPQsA6EFI0Yz7igNayF2gE1IPRyXnezPUxejQ+y+fAH/nQBLgWfYY/vyipUjzTCp3FhsjxuJMPp9ediITWqP60/QBWeGTPegCae+C1xiiYVVl7yrtq/GC3j9x8oMRRE/9ZSInWSln7aaw00qNtEzibovndimw== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230031)(4636009)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(186009)(1800799009)(451199024)(82310400011)(64100799003)(36840700001)(40470700004)(46966006)(84970400001)(40460700003)(40480700001)(31686004)(66899024)(2616005)(478600001)(6512007)(6506007)(6486002)(53546011)(2906002)(36756003)(82740400003)(86362001)(356005)(81166007)(31696002)(5660300002)(41300700001)(44832011)(83380400001)(26005)(70586007)(336012)(70206006)(316002)(36860700001)(47076005)(110136005)(8676002)(4326008)(8936002)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 11:59:34.7640 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35d2b4bf-1d23-4c3d-6dad-08dbe0522cdc X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5PEPF00014B8A.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB10385 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY 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: Hi Carl, Is the message body referring to a distinct patch than the one attached? The subject mentions gdb.base/unwind-on-each-insn.exp, but the patch deals with gdb.ada/inline-section-gc.exp. On 11/7/23 21:29, Carl Love wrote: > GDB maintainers, Luis, Tom: > > Here is the patch to fix test gdb.base/unwind-on-each-insn.exp on > PowerPC as discussed on IRC. Per that discussion with Tom and Luis, > the point of the test is to look for an error where a breakpoint in an > inlined ada function was reported as being set in multiple places. > There should only be one location reported for the test and the > breakpoint address should not be at address 0x0. The test also fails on > aarch64 but passes on X86-64. The issue is the location of the > inserted breakpoint in function callee may be reported as being in file > callee.adb or in file caller.adb. The location reported by the ada > compiler for inlined functions seems to be a function of either the ada > compiler version or target dependent. > > The following patch will accept the reported breakpoint location as > being correctly set in either file callee.adb or caller.adb. In either > case the address of the breakpoint must not be zero. The test checks > that the file line number matches the requested line number in file > calleeadb or one less if the reported location is in caller.adb. The > key thing is we want to make sure we have a reasonable line number and > the breakpoint address is not zero. > > The patch fixes the single test failure on PowerPC. It does not > introduce any additional errors on the X86-84 platform on which it was > tested. > > Please let me know if the patch looks OK for gdb mainline. Thanks. > > Carl > > ------------------------- > Fix the gdb.ada/inline-section-gc.exp test > > The original intention of the test appears to be checking to make sure > setting a breakpoint in an inlined function didn't set multiple breakpoints > where one of them was at address 0. > > The gdb.ada/inline-section-gc.exp test may pass or fail depending on the > version of gnat. Per the discussion on IRC, the ada inlining appears to > have some target dependencies. In this test there are two functions, > callee and caller. Function calee is inlined into caller. The test sets > a breakpoint in function callee. The reported location where the breakpoint > is set may be at the requested location in callee or the location in caller > after callee has been inlined. The test needs to accept either location as > correct provided the breakpoint address is not zero. > > This patch checks to see if the reported breakpoint is in function callee > or function caller and fails if the breakpoint address is 0x0. The line > number where the breakpoint is set will match the requested line if the > breakpoint location is reported is callee.adb. If the reported file is > caller.adb, the line number is one less. The difference is a function of > the source code. The key thing is the line number should be reasonable. > > This patch fixes the single regression failure for the test on PowerPC. > It does not introduce any failures on X86-64. > --- > gdb/testsuite/gdb.ada/inline-section-gc.exp | 23 ++++++++++++++++++--- > 1 file changed, 20 insertions(+), 3 deletions(-) > > diff --git a/gdb/testsuite/gdb.ada/inline-section-gc.exp b/gdb/testsuite/gdb.ada/inline-section-gc.exp > index b707335eb04..1f5dabc1896 100644 > --- a/gdb/testsuite/gdb.ada/inline-section-gc.exp > +++ b/gdb/testsuite/gdb.ada/inline-section-gc.exp > @@ -34,8 +34,25 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != ""} { > > clean_restart ${testfile} > > -set bp_location [gdb_get_line_number "BREAK" ${testdir}/callee.adb] > + > +# Depending on the version of gnat, the location of the set breakpoint may > +# be reported as being at the requested location in file callee.adb or in > +# file caller.adb where the callee function was inlined. Either way, only > +# on breakpoint should be reported and it's address should not be at 0x0. > +# If the breakpoint is reported in caller, then the line number happens to > +# be one less the the requested line number. > +set bp_location1 [gdb_get_line_number "BREAK" ${testdir}/callee.adb] > +set bp_location2 [expr $bp_location1 - 1] > +set test "break callee.adb:$bp_location1" > +set message "Breakpoint set" > + > # The bug here was that gdb would set a breakpoint with two locations, > # one of them at 0x0. > -gdb_test "break callee.adb:$bp_location" \ > - "Breakpoint $decimal at $hex: file .*callee.adb, line $bp_location." > +gdb_test_multiple $test $message { > + -re "Breakpoint $decimal at $hex: file .*callee.adb, line $bp_location1." { > + pass $test > + } > + -re "Breakpoint $decimal at $hex: file .*caller.adb, line $bp_location2." { > + pass $test > + } > +}