From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by sourceware.org (Postfix) with ESMTPS id 051EA3850414 for ; Wed, 24 Mar 2021 01:22:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 051EA3850414 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 12O1KlUc009430 for ; Wed, 24 Mar 2021 01:22:11 GMT Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2120.oracle.com with ESMTP id 37d9pn133n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 24 Mar 2021 01:22:11 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 12O1KPZb116851 for ; Wed, 24 Mar 2021 01:22:10 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2106.outbound.protection.outlook.com [104.47.55.106]) by aserp3020.oracle.com with ESMTP id 37dtxyyvxu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 24 Mar 2021 01:22:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QBN0BjFPlNZKe5x46FI3ncpB3oLCLun97YbJACr9l67kmBUwTuAtY6W7antN2SIW83gDeBLKjLirl5Vb7m5ZAiNM+xURtjpXEKB2ycIpOOUPgP0kO83BWW2XTKo5Cn+GAImphDjrzTg7LRzeZbgS7InWLye45cmJwaHnOpcShsMBecx9/WYEfmsVHLNcu863BCxViqHnW5QLYFZATj9kWjgKzxtb3/TAUUTmcoLGzxUlp5qYOIVTdCFaH8wGwisp5pIvdxVYiI9KDSNSo2/UvjwWrXdB/XPC/vR2JUsj5qYNwzpZb2/ILOWq2PnPgfSw0nXm0qLgSkngPLP3nSDfdw== 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=X9LFZmt7sYL/lFLxbwxfUfOcCt4VZvNORDdo496+QpA=; b=X/4g9pzHmoTKNjZiLC/p/7yQUTRlQcaZPSkmQKLydm+tCBHE+2+Nfu5l/0vXVelOi7NBrz/FM7PcBnk2HUeS/AlEvx+lj7wKOq+7pPv5PWU8RDFgXlrscJcHR6V1ibxh14Tc6+D5Wq29/1JSupPNFiQQg84gGTzCNSkniI3GwTmNI0zDpJv1pdK4rT5YdTYwUgabf8hRQu4T/7PnFMX3e7YwP2QhhevxNrkX06tSuokjeOkukZbZrIswfHEVNaOpxHEP1RJNftBDcjv4UfndsoNf39wij+tycQMppHIqtB0EMGyyhK7xTpLWdwCs/4m76YgamJC3+9h6P0NxIA+8TQ== 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 SA2PR10MB4715.namprd10.prod.outlook.com (2603:10b6:806:fb::10) by SA2PR10MB4555.namprd10.prod.outlook.com (2603:10b6:806:115::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.27; Wed, 24 Mar 2021 01:22:08 +0000 Received: from SA2PR10MB4715.namprd10.prod.outlook.com ([fe80::bdcf:f0:1350:5fa2]) by SA2PR10MB4715.namprd10.prod.outlook.com ([fe80::bdcf:f0:1350:5fa2%6]) with mapi id 15.20.3977.024; Wed, 24 Mar 2021 01:22:08 +0000 From: Nick Alcock To: binutils@sourceware.org Subject: [PATCH 1/8] libctf, dump: do not emit size or alignment if it would error Date: Wed, 24 Mar 2021 01:21:51 +0000 Message-Id: <20210324012158.35472-1-nick.alcock@oracle.com> X-Mailer: git-send-email 2.31.0.253.gdec51257f3 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [2001:8b0:1101:10::2] X-ClientProxiedBy: LO4P123CA0384.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18f::11) To SA2PR10MB4715.namprd10.prod.outlook.com (2603:10b6:806:fb::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from loom.srvr.nix (2001:8b0:1101:10::2) by LO4P123CA0384.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.24 via Frontend Transport; Wed, 24 Mar 2021 01:22:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6716b32d-c81b-47c9-2884-08d8ee633df4 X-MS-TrafficTypeDiagnostic: SA2PR10MB4555: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1265; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lg5riAOrA+EL1BSLiMoa/HdGN5UMbNdSBzCB+d/jGQb0QtVdFRkx27uYJ+Smo7Wit5TRaqp0HxzY8uQ6ab1+CMERds23dytQsP7JkhSTxBgzs3WX6B2vl9DsIaB8ARJAc/dxqKM+kKnOuiLqsyMtaR+z6cryWQfwrE5+MaK1roZ+NGebpF2dZNopoiFAdvFrZw3MhpLb7t2YLsYhIXVNdrtHAZQIlrXs5SmndvKqnryJuTYe/w/Kv9rFzLjKtNZ5QJhauFr3NH40r/o+PHAvOiXZDDJtYpwYfmKH9uNKPrwNvvG8I22gshD+0AypvnninP/lt42H7E9hPx9Iqnj7SalnJ+P8CvLLWracGlnoppEmcdjA326NY8No/ye5WRRn53M9P5vfRQ6WO4iGENItArF1ScgoaJ4hA8DJFfQ/v1mtbRyM9eWlNJEQ2B3gdt3Uri4LgzXxS9YuW3FxMEqQob5zsWm1YiNK2TaaSfGFcl0v72FA9Dfah0qKvjk2GBRAgyGUZD44xUTAJSbcUrVl9uaDjKvp266FF3nXILX24/hTqGhY30pw417uxXTH20DiQB4miaq9kOtrlmhAeW0GOkdlA+W5mnTdtJjVi2Ns6GXIwlZO52k776ZYfLsYLEFaoKEam+Te+KNlMr6CBNvKnn8IobDdnFoScyCJgcUpAYo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4715.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(39860400002)(396003)(366004)(376002)(346002)(83380400001)(8936002)(6916009)(2616005)(6506007)(44832011)(5660300002)(8676002)(36756003)(6666004)(1076003)(52116002)(478600001)(66946007)(2906002)(16526019)(66476007)(186003)(66556008)(86362001)(6486002)(316002)(38100700001)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?9sR5CYw9Z76MCWLKVgpHAanjBu/Wtru0nAej9W3mD7tnziYSbfXP5MAMlotL?= =?us-ascii?Q?buvnXsvJILTcpqgwjPj0zQJ4v8VwHRm9JmFRgCVjvJ5+blfOI4UEKtgAZXBH?= =?us-ascii?Q?guqnwllj3wRP3RyvLBVo7CiKOEww78GBAaDfmgv7dIjnfzV/ZxLOBsvWFboH?= =?us-ascii?Q?XjwJ3NEwvknUJ+tSMbuRU+mdqJtZcn49Z+n1kb+UDWzQssUbVy2xvwXere2j?= =?us-ascii?Q?/bl1CKurrQVmpPEpq1Edx6QZWNYPc1X4m9eTAUnYRvjfyYikJGI0xu+y5BdG?= =?us-ascii?Q?XFoVg1lgslR9dZ2QHfkzmS3lYsC33QzyOAl7G/RcihkDfZf/97D0vvbTLE4u?= =?us-ascii?Q?LM3sRNvWfsGVf/DMnB8ejmdp/fJQCbOUzgOT6VKv6morXA1aDFVymwWFEoTo?= =?us-ascii?Q?KzgIuZ2jwJ4oMsyfEn2OlHzwGMYi+X257QUlDxDvTevEJtWQ25Tdu3PZieTl?= =?us-ascii?Q?YIfFAZknHTjBS4WQXEguV+kiwIMUooegg3Dc8kAw74t5HCxGPd1TvDIZ7wNB?= =?us-ascii?Q?8L4heRGRHXdW7YhGY0mPG6OrTOfRKfACrKMKbGXcktPg1bt0xyzxSWwbkQac?= =?us-ascii?Q?pDM+3FvOi/BH7Z3JDn7f+ZwzwInWwgsXTiHtYRO1Hwr/hizi4Equizdp4UfQ?= =?us-ascii?Q?90m6BEl+Su8HVms1/UAAtUJ4n/wcln70CKx89whtAJMukYX2fN9sABCHgSwk?= =?us-ascii?Q?l364As6s8I9TdCjyCQ8NzR6y0FzFwawd6SlHt/W/RLcy7Mm0v5igG64JRN3o?= =?us-ascii?Q?nfV3tG07Gxd3d9OEesXmn9If3QghNcy3p4cUQESZrNy1zwWmLWhXK34c9VTP?= =?us-ascii?Q?QXeZopxbDjX9+M2NOT9WwNd8/K0/8uapU1094FTHMVKXsR67nSKoXGNwuQmb?= =?us-ascii?Q?PDLVOJqwwMmLAv7/SvCA/en3nV/QdJsan7xXhM8Wwv/YKbjCbs6PgcxylVz/?= =?us-ascii?Q?4VuensnNsGrFNfb3Sie43m5jjKDIgIWtR7BWAH0qkxhw18f5n16l3N0VCHQd?= =?us-ascii?Q?cKmovmScy5ie2aFt4AsQHsJnSzHcHsL1/Js9BsVv0jbUHHB3Ns1luHRSEETI?= =?us-ascii?Q?L4mmnKqQDiGg3WMJaHSTMa815B/Qe79XfuUHeEuxvBareOklUDLa5JyOdL7/?= =?us-ascii?Q?YUlhzKRnKsjU9VxE+7+Zja273O5EKb7ykqOX/MyMut5KTlVcAHJVQjQcKUfg?= =?us-ascii?Q?TnXWazsGn76lvZK2vQaUbMqpDB/QA090sTd1KiQM1bEUVU9VEyko3hHC8yUL?= =?us-ascii?Q?BMa87zjKk9qSJtprUCyRGcx1p6EIICuBADYwZB5HuJbw7xqgLv3rGhwMXNzf?= =?us-ascii?Q?r4q8frEF0JXYALz0sjxQ/rHI/+aaSQ+4IrIpzXdju+Qj8A=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6716b32d-c81b-47c9-2884-08d8ee633df4 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4715.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2021 01:22:08.2176 (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: ZTYUbq/R/r/yabxz+WoBg0kiAgMhNAxmfnFfISZfFWKqp/7oTYUVs3zYBW4g1ezVCK4V7V+zGhnaOh53gqKcCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4555 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9932 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103240007 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9932 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 bulkscore=0 spamscore=0 adultscore=0 clxscore=1015 malwarescore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103240007 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2021 01:22:14 -0000 When we dump normal types, we emit their size and/or alignment: but size and alignment dumping can return errors if the type is part of a chain that terminates in a forward. Emitting 0xffffffff as a size or alignment is unhelpful, so simply skip emitting this info for any type for which size or alignment checks return an error, no matter what the error is. libctf/ChangeLog 2021-03-23 Nick Alcock * ctf-dump.c (ctf_dump_format_type): Don't emit size or alignment on error. --- libctf/ctf-dump.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c index 8540212eadd..bd9b50d9479 100644 --- a/libctf/ctf-dump.c +++ b/libctf/ctf-dump.c @@ -100,6 +100,7 @@ ctf_dump_format_type (ctf_dict_t *fp, ctf_id_t id, int flag) ctf_encoding_t ep; ctf_arinfo_t ar; int kind, unsliced_kind; + ssize_t size, align; const char *nonroot_leader = ""; const char *nonroot_trailer = ""; const char *idstr = ""; @@ -180,10 +181,10 @@ ctf_dump_format_type (ctf_dict_t *fp, ctf_id_t id, int flag) bit = NULL; } - if (kind != CTF_K_FUNCTION && kind != CTF_K_FORWARD) + size = ctf_type_size (fp, id); + if (kind != CTF_K_FUNCTION && size >= 0) { - if (asprintf (&bit, " (size 0x%lx)", - (unsigned long) ctf_type_size (fp, id)) < 0) + if (asprintf (&bit, " (size 0x%lx)", (unsigned long int) size) < 0) goto oom; str = str_append (str, bit); @@ -191,10 +192,11 @@ ctf_dump_format_type (ctf_dict_t *fp, ctf_id_t id, int flag) bit = NULL; } - if (kind != CTF_K_FORWARD) + align = ctf_type_align (fp, id); + if (align >= 0) { if (asprintf (&bit, " (aligned at 0x%lx)", - (unsigned long) ctf_type_align (fp, id)) < 0) + (unsigned long int) align) < 0) goto oom; str = str_append (str, bit); base-commit: 70e958370c8f4dc3222b658a725571d8d2f5f98a -- 2.31.0.253.gdec51257f3