From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YBa9Fya+S2VOfgEAWB0awg (envelope-from ) for ; Wed, 08 Nov 2023 11:58:14 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=5TFF683w; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=5TFF683w; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 5CC491E0C1; Wed, 8 Nov 2023 11:58:14 -0500 (EST) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 2A90F1E00F for ; Wed, 8 Nov 2023 11:58:12 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BEE22385800C for ; Wed, 8 Nov 2023 16:58:11 +0000 (GMT) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2079.outbound.protection.outlook.com [40.107.241.79]) by sourceware.org (Postfix) with ESMTPS id 90F083858D33 for ; Wed, 8 Nov 2023 16:57:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90F083858D33 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 90F083858D33 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.241.79 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1699462673; cv=pass; b=Co+Y+HzgAK9IevRFZtplkS5L705IeF8ByCX1Y+sD9cEsNUpFlQPccViJC4bQFqF44uheasgD9q/xAg8fF9W0LVARK8xecG7yC/gyQI5cIOWeGpcLrwM6s0pD6jYc/kfwg/y4mkNm54IgL3KhRANOhnBcrd0xnJhaCBYPFAiskiQ= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1699462673; c=relaxed/simple; bh=cdNYovhhoAsqi2YS6FBc8EjXzvaseu5OtJfhZbMQ1G8=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:Subject:To:From: MIME-Version; b=D2sJ16P11Rqlsz8GBzPVVFoxffCshz8nrvHnsIz6r5hglPWQAXP/n0HjZWPlUsybGSXO6Ggaxm6HdEDmgv8hZABz/twF+0wzpECCrM8rbi/A6lOVnrcCWTDIkHlQZbdXTiTueBd0RtOqTmPUow5gNk6I8jFKSzGSlThX4gHzUv0= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=lzRT9rA2817XC6wlIwDhTS25cigbaU3FVWiunvwhyTGY0IavgvqkQ1U8XyKR96QI3ap2M12xgv9767ts/HHrDWtTGvn/FF9Bk9nVQ5p8Ob7duQUHg9kroLEIZx2EPUclFZW7RqJAMKNwQZHicG44tK94W9TpJHgVP2232t9AYlIuWNULQeAs+ddMvuOE/XD8ATxA/SZ7yVf32ybJvenRdOde++bfdtXXWAjE3QFMDikBp3dAsWV5yYb3/Rt/970BRediauSzVODFUyjiXt1ddzw/OzU5y2Rw4fMHWxKF3Gkh+wo9a/pwbzA/3f3GoNIopaGY2OUaYtlVlNLIxU4hqQ== 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=TN5zQhGb19x1j+mNT5mHzuB4Me1nU6ASN2zuhwBRCAs=; b=go6dBRFK1AYn4PXkf6UCR/MeR0jpQrCqumu/DqcTL0FP3d020KG8j+Uqp1XSDrFGWfyElcmTTzerlmzns4Z3OOB4gVVtZlsi+W3u/gysozYZSDCLrWRii34YhYxym0pHnOQkbNMc0pKe1xFZa2ZODnkaIVmlcC7qhaMrg0zzDI26Sf7HM4cgyaZ2KwlJIjjrx4Y0VR4JmvkbQYsfSp2YbC0lCnv69GruTtsY0swMDYXQkVnleFMa0vaEAZ23L0FtCpTJ4aDbKJbfh7z06Cc9z2/5j3qDRT2qOb8vPjH3qtaKrMyIUlVx7WldbQdncxUolV7A8Hd9ZeAYKFIiY0mNUw== 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=TN5zQhGb19x1j+mNT5mHzuB4Me1nU6ASN2zuhwBRCAs=; b=5TFF683w1AmL4C7vT58q290ZRe1KnhV+Nb9knWgbhVXKmptCBhPyN/zLaz9PsBWYQtxQyzGa8MEzshPVAUN0b7UbPLlUv3WBpU+rOxn+8uD0UPzvjBJyVkuqo2o43Fv6FDanr1WNXOY/58KlHCmxEQunhku5ud4pWwvfu972owA= Received: from AS4P190CA0028.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d0::17) by DU5PR08MB10413.eurprd08.prod.outlook.com (2603:10a6:10:518::18) 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 16:57:44 +0000 Received: from AM2PEPF0001C70F.eurprd05.prod.outlook.com (2603:10a6:20b:5d0:cafe::74) by AS4P190CA0028.outlook.office365.com (2603:10a6:20b:5d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.18 via Frontend Transport; Wed, 8 Nov 2023 16:57:44 +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 AM2PEPF0001C70F.mail.protection.outlook.com (10.167.16.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17 via Frontend Transport; Wed, 8 Nov 2023 16:57:42 +0000 Received: ("Tessian outbound 7c4ecdadb9e7:v228"); Wed, 08 Nov 2023 16:57:42 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 116a1e4a8c8ac94f X-CR-MTA-TID: 64aa7808 Received: from dcb23f0f485e.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 00E20B58-A9B3-4270-AF87-F7D8642BA1E7.1; Wed, 08 Nov 2023 16:57:36 +0000 Received: from EUR02-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id dcb23f0f485e.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Nov 2023 16:57:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bh6D1HwRJ5mr/c89NUhjUcYdMj+Xv+slzZOkvSn7Rpp1m2T2+NC4tgZWbDzFY3kjlQP4Xz6os1YeqcyUgOrbPMYTEbuzcEEd669rVfdjFrk6yI7id4X1qNkI0/XXC0t5hkxxKDst5G3LVFjANLYLvNocU4ZudEEJuKZ46KhPkgRFleVNufCTNIRmtnDdtrEhN19C0lkCYKUcFRisaFM8TE09qNwcc7FGPikRvCzNL2jVifvMn8AKpDWiHgueqP44h0VRlDtqM84tT3DeH1O/WNHbgiabBU+O0yfvwvfrwsw1OW2Dcl7rwVF+h/MqLRx9BD767+DK/x4E+szc0l4Q3g== 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=TN5zQhGb19x1j+mNT5mHzuB4Me1nU6ASN2zuhwBRCAs=; b=UVIiZC6/dTPY0y1sGJWeMz3jA52+/glzgk1jKmr0sfkhBvVyNh+hqPqzF9q+OJsSPy4+VDdcJZt2r434aUidAszN21i2ipGxayJR2tzjXbNnuYk1sFDyJiuoJch3NWFJ8bS+/bQqFnbJ+sZlgcqvlA0lzdwa5+PYaM9l49ywvC9xtcxcqV4jICupqONVD2huw8xwfKz8XXjM50bMp6DkVvB1skIu69XmTA2/zdeJbU78GdmyPd12TZsGFaJb36y1Bp8RJbbuEvXBCe+YUs8MgMhve26+BeAn60APYgNzNhCAjUdBGBcfGuh5I3hAYWT9D0FoH+I2o/v9okF22tQ2yA== 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=TN5zQhGb19x1j+mNT5mHzuB4Me1nU6ASN2zuhwBRCAs=; b=5TFF683w1AmL4C7vT58q290ZRe1KnhV+Nb9knWgbhVXKmptCBhPyN/zLaz9PsBWYQtxQyzGa8MEzshPVAUN0b7UbPLlUv3WBpU+rOxn+8uD0UPzvjBJyVkuqo2o43Fv6FDanr1WNXOY/58KlHCmxEQunhku5ud4pWwvfu972owA= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from DB7PR08MB3914.eurprd08.prod.outlook.com (2603:10a6:10:32::32) by PAXPR08MB7599.eurprd08.prod.outlook.com (2603:10a6:102:23e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.29; Wed, 8 Nov 2023 16:57:34 +0000 Received: from DB7PR08MB3914.eurprd08.prod.outlook.com ([fe80::b8b4:6bc5:52c3:abc8]) by DB7PR08MB3914.eurprd08.prod.outlook.com ([fe80::b8b4:6bc5:52c3:abc8%6]) with mapi id 15.20.6954.028; Wed, 8 Nov 2023 16:57:32 +0000 Message-ID: <54a336be-249d-40e9-b4e0-68602734ce26@arm.com> Date: Wed, 8 Nov 2023 16:57:28 +0000 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH ver 2] Fix the gdb.ada/inline-section-gc.exp test Content-Language: en-US To: Carl Love , gdb-patches@sourceware.org, Tom Tromey Cc: Guinevere Larsen , Ulrich Weigand References: From: Luis Machado In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: LO4P123CA0550.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:319::20) To DB7PR08MB3914.eurprd08.prod.outlook.com (2603:10a6:10:32::32) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB7PR08MB3914:EE_|PAXPR08MB7599:EE_|AM2PEPF0001C70F:EE_|DU5PR08MB10413:EE_ X-MS-Office365-Filtering-Correlation-Id: 45f6696b-22bb-4907-e26a-08dbe07bd301 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: Q4qeTWqNsgz3JzwGlfAsCL28uzc4zgn91wGXel5Q9skbCuQdtPRUtr+jBuOALNeudYITu9RCIncqdqKphMFlLL3lLRvFnMA7dFTbnJ4s3EMUlE0Rqk7kAP8IhgxJPjbu93eIyyZ1yxLKYhaZnCf+XYYcblfCBqv+mcWRpRRSB6jXk1h+TWWBvKI0Y1dBSeaYQrWV+hD8DiHGeeyP7WT6EH5ex3dZrH0Fd1l4q/sED2b6D1fG8l3iXDoZV2L3Mghj1bqYXGzJEewfFY5FQt7Yt3emejamRaV6WId696godRv09Q2CZyUXZCjMG7zyyGmmF0LD0CTOlzsHC+eVED5hygHmNL0FHnzDau/dkMtwM5shp5C0LvdQneAXbo5DRe65xzQxczFWoAWHjQfglnXgTBwlywc9D14YEWygsYfoTmahtTZh5JfH13ihrl521vsGqj5F0+HSXpcc5TMH6E7vDqZo/2mq+tMMXlEMwIHBvXjFIw1jlqtJIq1vMpn9Lix6YC8/9R26UovgTCcJfX2+7Tt15kfkkJvDAR4eyQP/i2WGpidW4HgfvP9kEe3KugKDRY0C0sCU4Q+XSvQoh8HwnktIlNAyPTDlyRjxS7sAQ2eI9RM7GEIE722GtBhiJqEH7ruTNJ9tpCVQJfaoYEmDCw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR08MB3914.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(136003)(376002)(39860400002)(396003)(366004)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(84970400001)(38100700002)(6666004)(6506007)(53546011)(83380400001)(31686004)(26005)(4326008)(6512007)(8676002)(86362001)(2906002)(8936002)(36756003)(5660300002)(31696002)(44832011)(41300700001)(66556008)(66946007)(316002)(66476007)(54906003)(110136005)(2616005)(478600001)(6486002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7599 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: AM2PEPF0001C70F.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: b5806bfd-7975-4e97-c252-08dbe07bcc98 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uIKqYctT5+H8ESUWJP9reodIwHKh5wULGbV0CMdEeRJIM+bSK8dcBw8s3xxn/ilWAq1o0QD6usABG7bfOVSxkUB93oq1TpT+DXWD451BJyJWOvwsB/uatzdBTRo8o+gEF9IiFmc6KmZD2E0MsMIGJKb5wXbbpZwFrwed8pXCMaoJ37aOshal0Sjm0GYBu6sJbRoY0G0WsAkXIk6FwVz18FKUwAtJdIfNbhGfvvWjaZLZRJyxJFq9ic/QUm1fgJoHn1ih/XuqOUxdS6ZaOu00f6Ydq82R2jk83/iEp2OfGWM705DnyPC4fKI2iOrwxowXgKFBtlCxT2WfLR2Lunw4qIgHl8cDylVvO/5/MTGo84t9S2JhmtSP9Dl62KvyFo1YSQAtYo0AZH36pKYCYC9tjzYmqho5sHe6PASjW4g//VgWNmlGPs45+/NQy2acD80WK8nmsy69o8e0+KfBC5DwqXXD+vtx+QWTVFcJXZ0aGqliBsLsOxc+qVLaoF+1T3FWzWH9I55rlJCEmd/JOx/VIjsShQ8t3kPuMNKyuKBlcm8yEJSy9pWTkNONXwBXH0fHVCL1I6DH48sx1r6UMQy/g/e7gPi0FkCKODWbS+iy0vNwRsZRxuFPsy28ngYZcDjws7wkHVZ/0a+ng1EQFVgP/qcf4QzF21mBKrh632OxexbV/M+JathSycJup8Gg3imLoavEf+jfPmDwsqtWtRVRFq6zDoUz+D70zbjEsNS6hs+Sx8XfO+A3LdFoufcY/7fM3c6UtKIrWecWEOY/c21V7g== 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)(136003)(346002)(396003)(376002)(39860400002)(230922051799003)(64100799003)(82310400011)(451199024)(1800799009)(186009)(40470700004)(36840700001)(46966006)(84970400001)(40460700003)(40480700001)(31686004)(47076005)(36860700001)(83380400001)(31696002)(36756003)(8936002)(44832011)(4326008)(41300700001)(2906002)(86362001)(8676002)(316002)(70206006)(6666004)(6486002)(6506007)(53546011)(81166007)(336012)(82740400003)(110136005)(478600001)(356005)(5660300002)(6512007)(54906003)(70586007)(2616005)(26005)(43740500002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 16:57:42.7991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45f6696b-22bb-4907-e26a-08dbe07bd301 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: AM2PEPF0001C70F.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU5PR08MB10413 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Hi Carl, This fixes the FAIL's I had been seeing on aarch64-linux. Thanks! Some nits... On 11/8/23 16:22, Carl Love wrote: > GDB maintainers, Luis, Tom: > > Version 2, fixed the name of the test the patch fixes in the email. > Mixed it up with another patch I am working on sorry about that. > > Here is the patch to fix test gdb.ada/inline-section-gc.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. s/on breakpoint/one breakpoint? s/and it's/and its? > +# 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 > + } > +} Otherwise looks good. Reviewed-by: