From patchwork Fri Jan 26 09:19:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 192465 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:e09d:b0:103:945f:af90 with SMTP id gm29csp539071dyb; Fri, 26 Jan 2024 01:20:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNFQuLKGKwQSNDrZcjGAsfdw6jzdJoa2esQWiUgNb9y6QQOOTJo5KV5AG3+UDdC/B5gCEe X-Received: by 2002:ac8:7f15:0:b0:42a:72eb:c0b with SMTP id f21-20020ac87f15000000b0042a72eb0c0bmr1245991qtk.98.1706260827189; Fri, 26 Jan 2024 01:20:27 -0800 (PST) Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id h15-20020a05622a170f00b0042a70ff16aesi776206qtk.432.2024.01.26.01.20.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 01:20:27 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=fail header.i=@oracle.com header.s=corp-2023-11-20 header.b=Gp0bGnvx; dkim=fail header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=ioMv38y0; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE850385828D for ; Fri, 26 Jan 2024 09:20:26 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id C28633858C20 for ; Fri, 26 Jan 2024 09:20:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C28633858C20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C28633858C20 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1706260809; cv=pass; b=WQG/4qAaD56SRaFP5NGA0s4DKolqt2PTB2ZBS2nGyWi6g6j3/Tq7lc1qyhy0KcM3EISjQyY5AMipSEio0SwV/tQvsqNFyM7wMd+qP+idYlTVoL1BmhvHz0Uz4qlMtafK1Gh96ExS7UViMzSlaM4iVSCuO8HOh1w/OkGlGsnxjoo= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1706260809; c=relaxed/simple; bh=2RYdpsdpb4acmmChhyOJmVKW+gQNotrARu9YP1tabcQ=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=Q7RKaeIrd32pYjVM3kOJi8HOfZJuBjm/PRRVnt3eTR5ygdp8A64J/IFzQ4NkzVTe3a2yAldJOoGfNPZrLC0Ldz/3kHZQvCydZxwjvakmhffz3fH8kOOY1Sy7uF2ooPxSN9D3VoLh4l6RP+qX6OjmWjmicQKpPi5lgcg8KJem4tc= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40Q9CPKl004946 for ; Fri, 26 Jan 2024 09:20:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=gpcjXT2IVbxMIgIMipehXNllwZyq9kRHfZQnNdsce1s=; b=Gp0bGnvxi8cZt9PmQHj4iUXJvGHABiJvn2flZ3oAfcokalz1mSmeY24JN94UJLU3srw+ ycYgF7rrCZH0wiw5DFeyeNUi+ndjI/yzhu0KI9Xb1VyJEY5UD0j83JSO+VdsG4YUSY7B BS6KHCjkW3DuOJeqz0sCsbZYV2mU5ucBBzzXWggV4+tAVRipZJDDUMsjIFNKzChrAF6J jsVyMuxxf0ghSdlItlUaWmnxTrBHB+fnAmvDnhNFFiSzaedbD5+bctiJw0JQ0UoCNK7h KMOwYxABQHjeVePOjld6zwfhVjLs4N9/jWDrTIpizdrrDlQ+M5D/XPWOEHtYRnHIDEa7 pg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vr7cy92q3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 26 Jan 2024 09:20:07 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40Q86LUw026166 for ; Fri, 26 Jan 2024 09:20:06 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3vs31a4dck-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 26 Jan 2024 09:20:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l1ij1sS0ByYKbQojdK6pMVY0IW05QOiewcFC31e8MixSU8Hv+3heX43sb7GUcC4vdtZzgqst6xMDEPkuJlcqfElxAM4P/lVXM0iEzMFj3cnhdy5dCfyZHj/UzNiADhVrA0hSlC0jHeabv+PQ/A23bQB7ld6g1/MTzLHbidniXkORXPY8PlQQntwMVqlUJqBEc8T5FKTCFB7XTqkJUbl7viT3IOgE2t3kjowyQsgem9nu5ZcQl2eHejTgcr5cBir+aG6i8H475nyd6YO5hX3GZhAG1SKHtiLw4UQStoeqDXVTyuFIMLdnJ2JXqiuPk3zAGJ3+LpzdaIckiarbRkbXnw== 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=gpcjXT2IVbxMIgIMipehXNllwZyq9kRHfZQnNdsce1s=; b=JLr3r3ESu1xY30MbzNYBUZ6C/f1CtCwg4OytRIN4S1GzK9iD1h4o9+gVxi9B/mKlinDNo9A7xJ4qqHbRA2D/kd/KgrYAOPa8ntDSLcasoAVq4SIeunvheXhIBydvv80GkzEw+KPJWYsagscWdHGVKrvvN8iL+2UiFP0HVvJ4/dJgtmTg+JunzBZZ300wyjZst/ldkLTtJKwSrni3Asuyp3FMiIMksfAgRsBV7mM8uHocrbIzlrZ5+xvbCbZz4Z5Uia0wls0xP51L1OENAPahvV3MGAm2LB+ZUlmm/87jF7vjnsgwSRgVCH5cNt5megSPP8W0ne2xtm3lP9ZNmsui/w== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gpcjXT2IVbxMIgIMipehXNllwZyq9kRHfZQnNdsce1s=; b=ioMv38y0P/60lYbCGBfsFVEXvr5UwCoKxF7re/Tt06/ZbKlx9SwxI07OBE4OfEQpJSpEGQm6LDNk6VcWV3wVD7Em1JcQFhEhacmc99/oIQ5x2kQF82ex5Hf+c/DMug9tnWWilghn43HsOT+QTiGRVknZHLuMpZRHbhJHB0LUe9M= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by DM6PR10MB4299.namprd10.prod.outlook.com (2603:10b6:5:216::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.27; Fri, 26 Jan 2024 09:20:04 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fde7:fb92:8ea1:a5ac]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fde7:fb92:8ea1:a5ac%4]) with mapi id 15.20.7228.026; Fri, 26 Jan 2024 09:20:04 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: Indu Bhagat Subject: [PATCH, V3 2/2] gas: scfi: untraceable control flow should be a hard error Date: Fri, 26 Jan 2024 01:19:17 -0800 Message-ID: <20240126091917.3266816-3-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240126091917.3266816-1-indu.bhagat@oracle.com> References: <20240126091917.3266816-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR04CA0390.namprd04.prod.outlook.com (2603:10b6:303:81::35) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|DM6PR10MB4299:EE_ X-MS-Office365-Filtering-Correlation-Id: d4280ed1-b4d1-4ed6-19c6-08dc1e4ffaed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: THZbqgb/wEmTU9PJenhIxmIPsqzEMSUmkuX3ZE9ST+KIMaRj+hg2kVpE1hTSpjNRqdeV1HxcWzHlZoQs+ghLWxQbhMzURBQxy6bHgIde0mp4KpS0T2yElONFE/QthEOx0de1lUQlCkECF2Y0dRFag9U6lwy+IoGH3fcoednqZlR1lc88s3/DyIVLICJwWcoBVioW3yOd+x2gxfLLpZTq7MCYYAgcEV7G+xeAeK+BWC6TfWkP6INZM/Bcszvi4fazwfG6tq/kiZ1Wla7p6yl++brU6sbk0gEgRUiI3XwmGX623SG6fuIFR4+oLLDjZD8DLm9k+bW0pj7DnEtH/uxOSxRO06HMbcSvqA74iFq/feFqFaaYswQMLkI0PxykvNH5i9YFBWJV0DazkwofTzqTh7jtJPeEs8ZRMUMUMUMhYPc5IsQjo+380Colo0wDKSP1/DtPMyeVLfNOGx0csPODEh/m86nUkZbwp7Kio7gJ3qTtBthYkuJGU+g6H3+/+KwF2qeWRcvdo4Y5H7RRCRhOMBOVtEuiXKaSnVS1oz7mzT3l+RH8quNjNzon63U2LvoWCN7377hPyWt2+cEduO9Cq7sxC3YL3ghzxeTVBjj/pZoMIPVCBMB0YV6DURjE0kXR 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:(13230031)(346002)(376002)(396003)(366004)(39860400002)(136003)(230273577357003)(230173577357003)(230922051799003)(451199024)(64100799003)(186009)(1800799012)(83380400001)(6512007)(2616005)(107886003)(1076003)(38100700002)(44832011)(5660300002)(4326008)(8676002)(8936002)(2906002)(478600001)(6486002)(6506007)(6666004)(66476007)(66556008)(66946007)(6916009)(316002)(41300700001)(86362001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IuMImAsTmNRpRZL7aq7e3ULJOJAVyOU0o2iSRNuCJRdRi4AQoaIOUGASvaKB03ymiuQVN0/LFb63j8BVVYIJ6BB8npyH94mLeFtXuqLXLjFTcn1yUCX/20q0eahEFZTsd0O2k6hCivJgUEpd1aPt12+zWmeRAo3kxKRlN7Z592Y220WWmUuhFM/UQc/kiMdk6oIjlJrPO3/rzaDd7I9BGNAZsYoX7V7K5AL4u4hiarojA0pIyXtlU6l+mb+vU7ksxQ6vYSPazUwMGofsavi8WYf56VBDTG56htjJvMQXBt3Y4VbExojWCBBtZXQ9EkYMiZIpHQ/ehA1BLGOp5obBOYmvw2F5WgSSBNl573m/1EhSZY/baXRJ4bdC5B6zWz4Zrvho7zPs9C4o8VCmCMUnKCgNqvE8siBAA0tRgP739v3XKA4aMZccTTKFQ0CWuu488Ll0n3QmgJyy6pC0fi4LTNeyBIYRMrj7abb/LMdXZyb7m4baKxXtHyf3gG6ywG2OYzczayEDSBZ3JE7OEcvbE1ZREuso8tQ2uTLvezY7vzzHsW5Edgj92ZMyILP9BDv8n7VGeD6SuEl1P5xAaWYFpbJraZtB6dPR41OgSSuMJ24hMngByfBt8OT27OZDcQjda7bIItU7zg0w80D/WiGV8wjoWQlnT1+84NEsF+h3I5em6mvdq4uGjYQ1vDUc2CDFy6zJfEpozuOeP1/2IAvnLD0lQiUNgsgyyjD0Tub6yE6k6VuRet8OJObe76RMG7AS2UCaDzBFSfT2wUc6U2JyyxWG8tyEuUAtMw53hYsP7bFzX3TcBQSzBfwnjjundAF5Th8MKCER4hz/Mz6PW5JJSQMm19qpKwU4Jwu0cWEZOPYaP6VkHvhvbPXVIWZ5XXM9we6tD3ywGhwf4Vx/AqpzoGtIUNgxTc+ZLOA17gGR0DolCi9wjOrl5FOWaDJnVXsP3QsZAypJqsbVKpxgX7fXoaf9MwtWRqL7Gv/VBgVrDprhLYeUbD/eJSuzJsvNbVJI4+2CiEMUaC2oc+UlYEOCpn0/956S8TziTk2FwbBMtIhUSrCYdxrkkeR+ugtglJvkeixtWyqDxAZU/SA+sP64rDEP9iDDb6bU8J8PUwNXtG8D6LcNkCKhySsKVQhaXf9CM9GY3cfvbpRrs5J3y60N2ZSnbX47HqrUKDr1rc6YyXeodgXvxbs0ZTRnADeeiQeCFXA57bqbLXWXrgu759syIbJ8cKv9oKK0OsXjY+7nZk9VHwHuv3LMWXMXVKgTeCAmZfv6OL6bwTkpE151x5MlnSIOylJvtDfz8LjF/ATFIj27XTZwcIZ5kggEvOjeY010IvRo0HjlwNWi6c+ONseYeFa89D9SkCU5c2+AUsQgCfwqUYoBIeBAg/1qkPm6UDx2LmkTOhQQg3BNNWO+9X6C6Xg8ZUVVkICW/UTRctgSGPYfETon9mGPRJya68wm70AqeqmpJxRQi3/4zec5CiQe/o7HGKX1/Lh+saGWVaieLZHJLeELj0mCFrj8DMhUik10EfFskQrZXroATnyAOlLs+VeKc/XPorC3lBqcyjfVpStJabucWDLQuGxhD7mSknkXMwo1i9aoBu3zm4Mk3eW2bH74iNUSttUoKHal6LFkomA= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: OoI0OasbP5TLuymaHqrzL0DSJJW1RmEyCqC+iWqrXMpI7GwjRhACa4JIc+ZtPxxxEtLoY8cn2q7Wpoi9KB4S7ysJpK8QtMDX4RPs6Cm5RZQEv2HkdhkAvYfoE+MtfikaUESM485sw7iI3hN/77ZNWvpml3vg4osRYw7Vs2Jso6YemTTrAd/+zLSq3l1MYMwctVIYTDe+YGMIstscR6NLo2rFyZezrNmfhbv5F7teMXOQbRfZ0aB6mwvrM/AclYRlUK3F+m8cJFcFd/Q5vesI2OPiwy375XeYidkoYlZgguYrfjIrO80KPMfKU05MsnpHnwxvAkb4Ccg87Z8oz/IKuZuQchMuzTgzpwSbFBj/liAEXSjrP5a/l1ZRpWcddO8NoE46aCmfUk+hc0nauAF/sdDLB2jdAMP7VIZQ+hfchJvkiikPBKRz/e829QjnLcVUxMnXvob5f5SsSCOaNMCelXsWUn/6+b0U7Z0OqOjCaL7yPZt9uXpFuZTke90MjM6fK0EZaw2y9l2Lb6Rjz7ogzXpOQ08GQ2jL9M0HU0D0EoQDEZYGxUfqkwSK8nXCvSGM8HxudRTWMry7UNKtCUU6kbhTZ+A+MUcDxjdORuSUpGg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4280ed1-b4d1-4ed6-19c6-08dc1e4ffaed X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2024 09:20:04.1882 (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: ujk3RAomtOALRoJe9vTunsXjGijqvoiAfpuOmRwJ++RqYeCP43qlOYgkHJ7uc2Mk/3QXiz9SKRa+kWhKTlD70A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4299 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401260067 X-Proofpoint-ORIG-GUID: nWWNfLwbavv91L28NZ-vLnEOMY4YYBmk X-Proofpoint-GUID: nWWNfLwbavv91L28NZ-vLnEOMY4YYBmk X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789144153422042592 X-GMAIL-MSGID: 1789144153422042592 [Changes from V2] - Remove string "SCFI:" altogether from the error message - Adjust the commit message [End of changes from V2] [V1 - Non existent. Sent first patch series tagged as V2 by mistake.] PR gas/31284 Currently, if an indirect jump is seen, GCFG (a CFG of ginsns) cannot be created, and the SCFI machinery bails out with a warning: "Warning: Untraceable control flow for func 'foo'; Skipping SCFI" It is, however, better suited if this is a hard error. Change it to a hard error. Also change the message to skip mentioning "SCFI", because the error itself may also useful when ginsns are used for other passes (distinct from SCFI) involving GCFG, like a pass to detect if there is unreachable code. Hence, simply say: "Error: untraceable control flow for func 'foo'" gas/ PR gas/31284 * ginsn.c (ginsn_data_end): Use as_bad instead of as_warn. gas/testsuite/ PR gas/31284 * gas/scfi/x86_64/ginsn-cofi-1.l: Adjust to the expected output in case of errors. * gas/scfi/x86_64/scfi-unsupported-cfg-1.l: Error not Warning. --- gas/ginsn.c | 4 ++-- gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l | 18 ++++++++++-------- .../gas/scfi/x86_64/scfi-unsupported-cfg-1.l | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gas/ginsn.c b/gas/ginsn.c index 5f6a67ce4f2..661f51d23c5 100644 --- a/gas/ginsn.c +++ b/gas/ginsn.c @@ -1161,8 +1161,8 @@ ginsn_data_end (const symbolS *label) /* Build the cfg of ginsn(s) of the function. */ if (!frchain_now->frch_ginsn_data->gcfg_apt_p) { - as_warn (_("Untraceable control flow for func '%s'; Skipping SCFI"), - S_GET_NAME (func)); + as_bad (_("untraceable control flow for func '%s'"), + S_GET_NAME (func)); goto end; } diff --git a/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l b/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l index fee76f9cc9b..ab6b50d47e8 100644 --- a/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l +++ b/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l @@ -1,3 +1,5 @@ +.*: Assembler messages: +.*:20: Error: untraceable control flow for func 'foo' GAS LISTING .* @@ -12,23 +14,23 @@ GAS LISTING .* 8 ginsn: SYM FUNC_BEGIN 9 foo: 9 ginsn: SYM foo - 10 0000 4801D0 addq %rdx, %rax + 10 \?\?\?\? 4801D0 addq %rdx, %rax 10 ginsn: ADD %r1, %r0, %r0 - 11 0003 E200 loop foo + 11 \?\?\?\? E200 loop foo 11 ginsn: JCC - 12 0005 3EFFE0 notrack jmp \*%rax + 12 \?\?\?\? 3EFFE0 notrack jmp \*%rax 12 ginsn: JMP %r0, - 13 0008 41FFD0 call \*%r8 + 13 \?\?\?\? 41FFD0 call \*%r8 13 ginsn: CALL - 14 000b 67E305 jecxz .L179 + 14 \?\?\?\? 67E305 jecxz .L179 14 ginsn: JCC - 15 000e FF6730 jmp \*48\(%rdi\) + 15 \?\?\?\? FF6730 jmp \*48\(%rdi\) 15 ginsn: JMP %r5, - 16 0011 7000 jo .L179 + 16 \?\?\?\? 7000 jo .L179 16 ginsn: JCC 17 .L179: 17 ginsn: SYM .L179 - 18 0013 C3 ret + 18 \?\?\?\? C3 ret 18 ginsn: RET 19 .LFE0: 19 ginsn: SYM .LFE0 diff --git a/gas/testsuite/gas/scfi/x86_64/scfi-unsupported-cfg-1.l b/gas/testsuite/gas/scfi/x86_64/scfi-unsupported-cfg-1.l index 1e138a102fe..c59ba93df45 100644 --- a/gas/testsuite/gas/scfi/x86_64/scfi-unsupported-cfg-1.l +++ b/gas/testsuite/gas/scfi/x86_64/scfi-unsupported-cfg-1.l @@ -1,3 +1,3 @@ .*Assembler messages: .*50: Warning: SCFI ignores most user-specified CFI directives -.*52: Warning: Untraceable control flow for func 'foo'; Skipping SCFI +.*52: Error: untraceable control flow for func 'foo'