From patchwork Thu May 13 00:05:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sebor X-Patchwork-Id: 1477902 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@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=rr/l5yhi; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 4FgX3k0RrRz9sWD for ; Thu, 13 May 2021 10:05:22 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F16FA39B6026; Thu, 13 May 2021 00:05:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F16FA39B6026 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620864320; bh=ZxFxYkP2E1oy/KEfN2WdFMNtRDRYl1++NepsreWs2qY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rr/l5yhicZRBpqYfw3Oz9Cem3BY31OLNaFklfxayrqMFSmp8rO883php7CGII/zg8 HI1uIN/CKXax+EX2qyacLY8DUNG5RtjiGYnktlydC3Pgdnz9hjdVxwmwBqSYB2mFI6 7oUd2HA9Af/Cuf8kC7rAORwZII5HHUwlGikXHkEk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by sourceware.org (Postfix) with ESMTPS id 1B8E63853838 for ; Thu, 13 May 2021 00:05:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1B8E63853838 Received: by mail-qt1-x830.google.com with SMTP id j19so18612550qtp.7 for ; Wed, 12 May 2021 17:05:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=ZxFxYkP2E1oy/KEfN2WdFMNtRDRYl1++NepsreWs2qY=; b=L/vR7LlOhV5u4uctVI5pmgywXCajla3Yed202PkQz0HbRNCWk4Z/dYChLzXWkmDt6X cC0RtusSI+i1oXdgwk2mQyHlXwkcc6XQ5nA1Ln0duZPS+6LlmL47FTRPoSoPImWWV1wF 4PMAoE1+mLnWXfWbaChcbbYFKTl56cCWiV8JWn63jCF9WGEecF65XK254ruMIEXNgN0G C/2RWNqmLoF/0DuVeATNOpfWOK47KxfTAmhiPgXlzO1876UFK3WxkYf41gBcPweIKAyG XlDntVir7+BeIBg9CxyWwMBzmoik0amaW1nO3Em+Rhwqxi4YglM4/aH4EwncMdmayXQY zSpA== X-Gm-Message-State: AOAM532O9patt+Clx+B0bj8RczStfYDGyWF/iwk+CVibCX09giHi4pBg ObEjzBpZKRnus4W77cRWKoJQQGkCnNk= X-Google-Smtp-Source: ABdhPJypHHTkhdJaJnfy6ZICUB4U6Fnzk2sbRweJbBkL+48eETbKn4yvwKuZ21mJb1rOghYxyWPFVw== X-Received: by 2002:ac8:5f47:: with SMTP id y7mr35255083qta.284.1620864316442; Wed, 12 May 2021 17:05:16 -0700 (PDT) Received: from [192.168.0.41] (71-218-14-121.hlrn.qwest.net. [71.218.14.121]) by smtp.gmail.com with ESMTPSA id q13sm1343668qkj.43.2021.05.12.17.05.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 May 2021 17:05:16 -0700 (PDT) To: gcc-patches , "Joseph S. Myers" Subject: [PATCH] avoid erroneous VLA bounds (PR 100550) Message-ID: <2b86b3c7-ff39-bbea-cd69-613537b9e26f@gmail.com> Date: Wed, 12 May 2021 18:05:15 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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: 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: Martin Sebor via Gcc-patches From: Martin Sebor Reply-To: Martin Sebor Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" An erroneous VLA parameter bound in a function redeclaration causes an ICE as the -Wvla-parameter is trying to format a diagnostic after an error has already been issued. The attached change prevents such parameters from being considered. This patch is for trunk and GCC 11. Martin PR c/100550 - ICE: in fold_convert_loc with function call VLA argument gcc/c/ChangeLog: PR c/100550 * c-decl.c (get_parm_array_spec): Avoid erroneous VLA bounds. gcc/testsuite/ChangeLog: PR c/100550 * gcc.dg/Wvla-parameter-9.c: New test. diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 3ea4708c507..53b2b5b637d 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -5856,6 +5856,9 @@ get_parm_array_spec (const struct c_parm *parm, tree attrs) spec += buf; break; } + else if (!INTEGRAL_TYPE_P (TREE_TYPE (nelts))) + /* Avoid invalid NELTS. */ + return attrs; /* Each variable VLA bound is represented by a dollar sign. */ spec += "$"; diff --git a/gcc/testsuite/gcc.dg/Wvla-parameter-9.c b/gcc/testsuite/gcc.dg/Wvla-parameter-9.c new file mode 100644 index 00000000000..6c8987a34eb --- /dev/null +++ b/gcc/testsuite/gcc.dg/Wvla-parameter-9.c @@ -0,0 +1,30 @@ +/* PR c/100550 - ICE: in fold_convert_loc with function call VLA argument + { dg-do compile } + { dg-options "-Wall" } */ + +struct S { int i; }; + +extern void v; +extern void *pv; +extern struct S s; +void vf (void); + +/* Verify that a function redeclaration with an invalid VLA doesn't ICE. */ + +void f0 (int[]); +void f0 (int[undeclared]); // { dg-error "undeclared" } + +void f1 (int[]); +void f1 (int[-1]); // { dg-error "size" } + +void f2 (int[]); +void f2 (int[v]); // { dg-error "size" } + +void f3 (int[]); +void f3 (int b[s]); // { dg-error "size" } + +void f4 (int[]); +void f4 (int c[pv]); // { dg-error "size" } + +void f5 (int[]); +void f5 (int d[vf ()]); // { dg-error "size" }