From patchwork Wed Jan 22 01:25:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 1226874 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=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-517955-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=Fsh/WEt3; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 482SQP182bz9sP6 for ; Wed, 22 Jan 2020 12:25:31 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=iwasbiYK28NrOjSZkrTWlSG9jXMsS0QNRNMIP8YY7zvQtQ4Wm6c8A 7ZGt1f7SAnNN22Jl9FbkFd6Q7/hrKIqhayJo4lYfFucg8XhbMH7XKTQ6N9pPlkBg Aqft/zZXzMevnt5ol2+33jjD10JTAUIxZqbjvMxlgD78ZZNu+Eczhs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=g6uOglAu3QqjhOt3UxBeQsSgJjo=; b=Fsh/WEt39kD4d+yEgvOB o59cyqoO+E2VDy4c42L2Yrxok0A3pwqJ0XDOwWKH65/pTb7YDNhqk3RYmmOPiKme 7bRDwDHb32WHj5jqikaGbS5qJLK1K5dKG0/7AKbtnd1197elx0N20p1tKOQXVXi3 sVZGYZpSxdfgVCGsfmAOc5Q= Received: (qmail 101950 invoked by alias); 22 Jan 2020 01:25:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 101941 invoked by uid 89); 22 Jan 2020 01:25:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: esa3.mentor.iphmx.com Received: from esa3.mentor.iphmx.com (HELO esa3.mentor.iphmx.com) (68.232.137.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Jan 2020 01:25:21 +0000 IronPort-SDR: El+D4j13c509Grfmh1SCe3zqtqkOPkC0+yRv4jpRW1S+TJPhWmr7/0mwWqpfJeqItw3r5SdQaQ VaWJ6HAwiDdHwa7xfvuyQVug7q/ZVMr6I5xE2eF692o0RmijOUgR6KXv4ECOf2fjxrOQmv+kRs 5MMPek7hRSJDf/cPRuWxnYouaTD7rdmFtyPEKFe4Q5ITCafqzKMgIqIJcMHDyuH57cI9DhjbtT 9lTrY4zV3k+vTSqWVaQWnJXxC0tBDbcWoiQtmMTxapNjMUVSufJoe0Uft5I0u6Dip6fYNf009D 8bU= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 21 Jan 2020 17:25:20 -0800 IronPort-SDR: 3ld9bXktdSn/LiRez1BpPLd4C9pVcsMMKgogWjUTlibzw6ue9y7GAK+u3EnuCWPa5+zVUUx4Wr D39agL3as0eA== Date: Wed, 22 Jan 2020 01:25:15 +0000 From: Joseph Myers To: Subject: Fix ICE with cast of division by zero (PR c/93348) Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Bug 93348 reports an ICE on certain cases of casts of expressions that may appear only in unevaluated parts of integer constant expressions, arising from the generation of nested C_MAYBE_CONST_EXPRs. This patch fixes it by adding a call to remove_c_maybe_const_expr in the integer-operands case, as is done in other similar cases. Bootstrapped with no regressions for x86_64-pc-linux-gnu. Applied to mainline. Will also backport to GCC 9 and 8 branches. gcc/c: 2020-01-22 Joseph Myers PR c/93348 * c-typeck.c (build_c_cast): Call remove_c_maybe_const_expr on argument with integer operands. gcc/testsuite: 2020-01-22 Joseph Myers PR c/93348 * gcc.c-torture/compile/pr93348-1.c: New test. diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 9866c83faf2..8df0849bd8b 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -5715,6 +5715,8 @@ build_c_cast (location_t loc, tree type, tree expr) expr = TREE_OPERAND (expr, 0); value = expr; + if (int_operands) + value = remove_c_maybe_const_expr (value); if (type == error_mark_node || expr == error_mark_node) return error_mark_node; diff --git a/gcc/testsuite/gcc.c-torture/compile/pr93348-1.c b/gcc/testsuite/gcc.c-torture/compile/pr93348-1.c new file mode 100644 index 00000000000..d2edec565ee --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr93348-1.c @@ -0,0 +1,5 @@ +int +ya (void) +{ + return (long int) (1 / 0); +}