From patchwork Mon Feb 14 12:54:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Sayle X-Patchwork-Id: 51097 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D5B4D3857C4E for ; Mon, 14 Feb 2022 12:54:38 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from server.nextmovesoftware.com (server.nextmovesoftware.com [162.254.253.69]) by sourceware.org (Postfix) with ESMTPS id 0D2FC3858412 for ; Mon, 14 Feb 2022 12:54:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0D2FC3858412 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=nextmovesoftware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nextmovesoftware.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nextmovesoftware.com; s=default; h=Content-Type:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wKhr6KAMYCB2q5kQI3rNd4KYcpzRl8Ij3jMMuUarWwQ=; b=sLyEu0OBfj4ICVgOZjpniPMckR X5oMtsBcf5P8BD5I22hTU4k6sMXt+SWS0utejwcazk5V8Na6VLfVdCncOGCrNjmuoFxWv15uGWg+p lPbk/Zu/guKejNE/UTpv+wv+FBHw6suEVvUu+rnH8JXDBG91egVU6xwnqwWulN8q2vkITQnxFDAe0 dVl+ORXlPuIhFC6OcXO4xIwxeH9wJDorJRZ0/bvnHazxvMZYZ2IhZHrwCf1w9aLmr4SFBQNRmt2Ib V9q87X4XkdwhpqlmOBnXe6L7xoQKESloQr327nRNVoNyCpUfORYRU8Eiium+6c0vGwfrodw25kG2R tXOah0Wg==; Received: from host86-186-213-42.range86-186.btcentralplus.com ([86.186.213.42]:55185 helo=Dell) by server.nextmovesoftware.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nJas1-00039q-3e; Mon, 14 Feb 2022 07:54:21 -0500 From: "Roger Sayle" To: Subject: [PATCH] PR c/104506: Tolerate error_mark_node in useless_type_conversion_p. Date: Mon, 14 Feb 2022 12:54:18 -0000 Message-ID: <00c501d821a1$fbcf55b0$f36e0110$@nextmovesoftware.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdghoadDMS5aZVJyTK+7Q0Ylp4Rvkw== Content-Language: en-gb X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server.nextmovesoftware.com X-AntiAbuse: Original Domain - gcc.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - nextmovesoftware.com X-Get-Message-Sender-Via: server.nextmovesoftware.com: authenticated_id: roger@nextmovesoftware.com X-Authenticated-Sender: server.nextmovesoftware.com: roger@nextmovesoftware.com X-Source: X-Source-Args: X-Source-Dir: X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HTML_MESSAGE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This simple fix to the middle-end, resolves PR c/104506, by adding an explicit check for error_mark_node to useless_type_conversion_p. I first trying fixing this in the C front-end, but the type is valid at the point that the NOP_EXPR is created, so the poisoned type leaks to the middle-end. Returning either true or false from useless_type_conversion_p avoids the ICE-after-error. Apologies to Andrew Pinski, I hadn't noticed that he'd assigned this PR to himself until after my regression testing had finished. This patch has been tested on x86_64-pc-linux-gnu with make bootstrap and make -k check with no new failures. Ok for mainline? 2022-02-14 Roger Sayle gcc/ChangeLog PR c/104506 * gimple-expr.cc (useless_type_conversion_p): Add a check for error_mark_node. gcc/testsuite/ChangeLog PR c/104506 * gcc.dg/pr104506.c: New test case. Roger diff --git a/gcc/gimple-expr.cc b/gcc/gimple-expr.cc index f9a650b..e63fa3c 100644 --- a/gcc/gimple-expr.cc +++ b/gcc/gimple-expr.cc @@ -83,6 +83,9 @@ useless_type_conversion_p (tree outer_type, tree inner_type) return false; } + if (inner_type == error_mark_node) + return true; + /* From now on qualifiers on value types do not matter. */ inner_type = TYPE_MAIN_VARIANT (inner_type); outer_type = TYPE_MAIN_VARIANT (outer_type); diff --git a/gcc/testsuite/gcc.dg/pr104506.c b/gcc/testsuite/gcc.dg/pr104506.c new file mode 100644 index 0000000..79cec1a --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr104506.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +double x; +/* { dg-message "note: previous declaration" "previous declaration" { target *-* + * -* } .-1 } */ + +void foo (void) +{ + x; +} + +int x; /* { dg-error "conflicting types" } */ +