From patchwork Tue Jul 6 01:25:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 1501019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=tjPRIoZA; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GJlJz45ckz9sXN for ; Tue, 6 Jul 2021 11:26:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 337303877438 for ; Tue, 6 Jul 2021 01:26:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 337303877438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1625534813; bh=SDCFs2RBb8RIHVVF1uoCi2+td3vMDnuh6yylgM0FZIs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tjPRIoZAVs5knEKVFM8q+31GfpM2ygP/oSOEKT0K8JWuFaaX8q4j7OJ0Qiiq3w7rL Ip0emVKWOhjMX1a+V1gQZ+ta4lmFIpAyyW1sXTRP2gyveyeVppCCHuOOkPVt/4N8qS yLRGtwZHJKBvPQuQ9aUvpYzmtFfU/oxOB1R+K/2E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id A274C385AC1F for ; Tue, 6 Jul 2021 01:26:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A274C385AC1F Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 1661GDqV014402 for ; Tue, 6 Jul 2021 01:26:07 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 39m27h8s2c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 06 Jul 2021 01:26:07 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 1661GQ5F148648 for ; Tue, 6 Jul 2021 01:26:06 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2049.outbound.protection.outlook.com [104.47.66.49]) by aserp3030.oracle.com with ESMTP id 39jdxgax4v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 06 Jul 2021 01:26:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WXaa01OWSGf9PIhaWLw6uB8XX+5HrdXEFg6LZu9xlv6iUJpWPvhzeMEvpduZDDJxUuCeyGACozb/552XNAn5VakGq0V6yXbD81iBvHqAavsmwHzeQ+4HA2ZdFxbhLc9XSYHYdVIXiuyiwnxUFCSkAq0ZP7LIZaz52c3QwvgEJs+mT8yfwygPGi9wT9HTStIWt7rZF3dYdADRxQP3VZviw+Af78etDv49LwDhs/0jqeDZX21skE65y41EFv4VieWX9fj4Je07Kb5UnVQu1/jg5xoYcwHuxhkd7Z7FBDRoMQbKkGdBBgEw6b4FOmK1E6K9nXl4Dh+2Ad9g8E7S0wfhKA== 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-SenderADCheck; bh=SDCFs2RBb8RIHVVF1uoCi2+td3vMDnuh6yylgM0FZIs=; b=agMwb5tyi9I1sQJffvUqKEW4QiSw8yfmxWisBqZl6QyPK5N1v1/E/rz8zpfX30DkNqWzjZOTOgqZwTkMio2NubDqgBKL0ijvu85OjoVmNqvQMM6chTDHHaf8xTlS+W8PaW/wek5gi7c3l598AS6kNXCzfLl+hlIY2e6xtcAx8k2SWAxwQZXSjpHhKzx4gt04xAU9cdqUhCKPF5iuJD/GgaBhu/wmsl3n48PvSiEgmCYFeDsmiRWEFEcEub9wflqVU599QuIX8FpcIJUIe6oAzaL/WZ8ffzUiIPdmbsMeo19aupgCo0YnqktyEmbO4n2ldTKgpEuuOH5n4ReHfTlRFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by MWHPR10MB1424.namprd10.prod.outlook.com (2603:10b6:300:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.27; Tue, 6 Jul 2021 01:26:04 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::1076:c9ce:4957:e3f3]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::1076:c9ce:4957:e3f3%5]) with mapi id 15.20.4195.029; Tue, 6 Jul 2021 01:26:04 +0000 To: gcc-patches@gcc.gnu.org Subject: [PATCH] dwarf2ctf: the unit of sou field location is bits [PR101283] Date: Mon, 5 Jul 2021 18:25:54 -0700 Message-Id: <1625534754-13995-1-git-send-email-indu.bhagat@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Originating-IP: [24.80.24.133] X-ClientProxiedBy: MW4PR03CA0122.namprd03.prod.outlook.com (2603:10b6:303:8c::7) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ibhagatpc.hitronhub.home (24.80.24.133) by MW4PR03CA0122.namprd03.prod.outlook.com (2603:10b6:303:8c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 01:26:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50b6b6fb-628c-4c0a-27e1-08d9401d05a5 X-MS-TrafficTypeDiagnostic: MWHPR10MB1424: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WUsDHSDo2bIHfusTZao16iWfRqkNCRLxdcHUQCwmSqASXnNXd/sBSHKH7zRz9pCIh5ofcrMjlwRerSHNp8eJvkuUiFTSG76PYw9agKadCdaZ0VUeLNyfCkEybfzcTJfgpHVfqahtU5RRiOvn+zxlLxhqT7vHQERRDVD5q7t5h0OVieNX0O2LuOwYyHWEuomv4lm/DcBRI8WJrrYAcCre52ortJA5Ar777YlUX1aEeHxLYPNEwXIfUGGMqYUlum0wuDCGFpEhUVmeP0ANliRQ5Qggf6r566dB0bWMpWnET+9HD+icuce51XdqSeI7vEWAsxRbmmWKh9RaMjry6AbxNwiulut32p6LJSbrpuiBeqZmjNZgpor39YsBYTIDpuB7gM84CSuDW97SGNhmfvM/u70U7B6xh/yGmLOAEv81cvBOuXMm5oJJpwYYi5yWBnZcS6NQcpDmBZ3LNcCgBizAsYz/AzwR/Qy/pMeMVM7y4BfAaADQih8sep+ulNbWQC/Wxartzw+tUwpMBPtJBPvt19Lh2G0mYGv9lik2ksAO+o53UnQNNiGAlhzvAEq0ybwYsFDZOkO0jTMbt2/aEIVucbm2Bz9gzAZIPV5uKZpvZ6MCsPBeTYljbhCoHzvtGrtjn0sIxjK+oIeBsQnxjPC+F51Wx2Sfu83Zwb3eIqoVKvjFpIs53Ye5sDg67PkAw1Zdly4BXwP3h7jG92oTNnt4kud9PVxVnF63XuBf8lbW75cplGJZcwjd+WcdmwzjSnZ2wUd1rgcOxVVxFd7aCt4OLhGYvQRwDKOEnvaG8fwv/FY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(39860400002)(346002)(376002)(366004)(6666004)(956004)(52116002)(5660300002)(44832011)(2906002)(8676002)(186003)(16526019)(36756003)(38350700002)(2616005)(38100700002)(6506007)(478600001)(66476007)(66556008)(6512007)(66946007)(83380400001)(86362001)(6486002)(26005)(8936002)(316002)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AGhKaBX5zLSub7QMoHlatGALskrGWQnnUeuNA+O5qzSIfO3U+j92s2iRJuoGOSPt/RF5siPHIzV7Eo4Uts1mqg0H75bo+KdBK1RXQuXiIDWSn8Mt488UJF6K0B/19kqLdfVRFiVGcuUPd+dqU7CEKz5wJqADWsdIRRhGN1DloiMVtE/NQn82Eo8xlWlfgfyP3KZVW8VPMvzDaBewCuD66I+QExDiHqZrb02FxpDwqiNj7X/hgqXzE6CGBgPx3vFizfK+i9sGdXPBLP09NX1BR3ceSIg77qkDXPCWGRg+9bhNaGnJYj65VMxfhuxEClYg3UbjOcaZL08Mk6DooDjDb3/zRgPXUXaB6jGyGbCWbADrAZJn6wgAMg/rWqneyJ8yO8VyXy+y2rWf634yq6gdNb97ecwhBVTYwyWNmC59z/Tkp0oeBLcI6pCbjhPCY+vBHu9/TzH/rm7arpsjWadgmOAIjv6VMn7I++X8hiax3/fVdNnYxV0Uk00aH2BVy3vUorZ1dqjvG0RCFPipOBnU92cowxZy8ScJAnCrJc8ObIsEB6ZhmhXb6hE1wI81ceSCpiD5uJU3hfizYr//RHwCuYoiAW2vZwwEIOAf7iLdZXR1zCgWMz4oWZBFk+Qq2v18B2LcjZo3rfyvD6PwK2Tj6gKFyujajvNQ/m43+RcCa3pTD/bVTu1QapD/ELXsClG30xa1ZnsucdIJqI7tH+PUpiHQcSD7lqUkMT2YzHuvFHSp8RCnNVpqURZhhUcbhSJu/LmeeAXHAoC2pbPEGeGMX3npUGoUrLaHzsty4Mahse0Lx5AYi6qa6odt0JhwAovUOHyKonrta5nDWhcHknrqmKGnPKAjEhLo9WubaANG94CB63EhPafb1e3vYmgRncmNKjrvDmGvUlec63NTJMNBtpVhUdGu58BtQDIeR833SmLrr4NXcf738I+P/CgretRXabfpBR6GEiNmikorXX+uhNIsfW1VunvUSeLtBbjKfjG1rfMsm4gLQ2hMRu/RaIac6VFC82s+vDIrCOb4juIKb5x9LFyTsHjSB80jI4+7sPpesBCDuV2KNM5muevQK7L9TMVnx0tKUyfd01/NFuR2buMby4zFdRz+n2dLglzoozPQdezLpq8b7leMzTS3cK/NphHXSi2qUQ11FVGhPaSWZ8XEXEpX25q95ZTEXc5JkPkY7IJfC0l9R98RC61eyL8e2mLe7+s/aUn0kxkMGFhz8BZpinjzmM8MZeQuc1Va6wGZHbU7yVYX0GARa7W5CBBKRDZJB74QiGmog16SaxeyU6POJOe6Hvuyy3g7VlXcsWJ8cjbepPSURLQY9h5FhzlM X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50b6b6fb-628c-4c0a-27e1-08d9401d05a5 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2021 01:26:04.3993 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2rmHGxMiQj/M2ZGNYhY74hlq5WTflCFMV6nsRKCTN8X3/DkA/3HHJwP69I8nhej2JnNM69oRXW8D3mBd1FRLKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1424 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10036 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107060005 X-Proofpoint-ORIG-GUID: iil2ovlf06Jx-oB_NQoqn1vZtIT-TzkX X-Proofpoint-GUID: iil2ovlf06Jx-oB_NQoqn1vZtIT-TzkX X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Indu Bhagat via Gcc-patches From: Indu Bhagat Reply-To: Indu Bhagat Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" If the value of the DW_AT_data_member_location attribute is constant, the associated unit is bytes. This patch amends incorrect behaviour which was being exercised with -gdwarf-2. This caused some of the failures as noted in PR debug/101283 (specifically the BTF tests involving btm_offset). The testcase ctf-struct-array-2.c was erroneously checking for the value of ctm_offset in number of bytes. The patch fixes the calculation of the field location value for a struct member in dwarf2ctf and adjusts the testcase. This patch also fixes some of the failing tests as noted in PR debug/101283. 2021-07-05 Indu Bhagat PR debug/101283 - Several tests fail on Darwin with -gctf/gbtf gcc/ChangeLog: PR debug/101283 * dwarf2ctf.c (ctf_get_AT_data_member_location): Multiply by 8 to get number of bits. gcc/testsuite/ChangeLog: PR debug/101283 * gcc.dg/debug/ctf/ctf-struct-array-2.c: Adjust the value in the testcase. --- gcc/dwarf2ctf.c | 4 ++-- gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-array-2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/dwarf2ctf.c b/gcc/dwarf2ctf.c index 08e1252..5e8a725 100644 --- a/gcc/dwarf2ctf.c +++ b/gcc/dwarf2ctf.c @@ -100,13 +100,13 @@ ctf_get_AT_data_member_location (dw_die_ref die) gcc_assert (!descr->dw_loc_oprnd2.v.val_unsigned); gcc_assert (descr->dw_loc_oprnd2.val_class == dw_val_class_unsigned_const); - field_location = descr->dw_loc_oprnd1.v.val_unsigned; + field_location = descr->dw_loc_oprnd1.v.val_unsigned * 8; } else { attr = get_AT (die, DW_AT_data_member_location); if (attr && AT_class (attr) == dw_val_class_const) - field_location = AT_int (attr); + field_location = AT_int (attr) * 8; else field_location = (get_AT_unsigned (die, DW_AT_data_member_location) diff --git a/gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-array-2.c b/gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-array-2.c index 9e698fd..37094b5 100644 --- a/gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-array-2.c +++ b/gcc/testsuite/gcc.dg/debug/ctf/ctf-struct-array-2.c @@ -10,6 +10,6 @@ /* { dg-final { scan-assembler-times "0x12000000\[\t \]+\[^\n\]*ctt_info" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0x4\[\t \]+\[^\n\]*cta_nelems" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0\[\t \]+\[^\n\]*ctm_offset" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \]0x4\[\t \]+\[^\n\]*ctm_offset" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x20\[\t \]+\[^\n\]*ctm_offset" 1 } } */ static struct ranges {int from, to;} lim_regs[] = {{ 16, 7}, { 16, 6}, { 20, 7},{ 20, 6}};