From patchwork Wed Nov 30 19:27:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 128560 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 117ECB6F75 for ; Thu, 1 Dec 2011 06:27:53 +1100 (EST) Received: (qmail 18347 invoked by alias); 30 Nov 2011 19:27:51 -0000 Received: (qmail 18339 invoked by uid 22791); 30 Nov 2011 19:27:51 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-vw0-f47.google.com (HELO mail-vw0-f47.google.com) (209.85.212.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 30 Nov 2011 19:27:38 +0000 Received: by vbbfc21 with SMTP id fc21so798510vbb.20 for ; Wed, 30 Nov 2011 11:27:37 -0800 (PST) MIME-Version: 1.0 Received: by 10.52.90.80 with SMTP id bu16mr3250337vdb.113.1322681257571; Wed, 30 Nov 2011 11:27:37 -0800 (PST) Received: by 10.220.229.66 with HTTP; Wed, 30 Nov 2011 11:27:37 -0800 (PST) In-Reply-To: References: Date: Wed, 30 Nov 2011 11:27:37 -0800 Message-ID: Subject: Re: [PATCH] Fix C/51321, ICE With incomplete types with __builtin_types_compatible_p From: Andrew Pinski To: GCC Patches X-IsSubscribed: yes 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 Woops, I forgot to attach the patch. Thanks, Andrew Pinski On Wed, Nov 30, 2011 at 11:23 AM, Andrew Pinski wrote: > Hi, >  The problem here is that right after groktypename we take the > TYPE_MAIN_VARIANT of the result which is incorrect.  There needs a > check for error_mark_node.  This adds the obvious check and fixes the > ICE. > > OK?  Bootstrapped and tested on x86_64-linux-gnu with no regressions. > > Thanks, > Andrew Pinski > > ChangeLog: > * c-parser.c (c_parser_postfix_expression): Check groktypename results > before looking at the main variant. > > testsuite/ChangeLog: > * testsuite/gcc.dg/pr51321.c: New testcase Index: testsuite/gcc.dg/pr51321.c =================================================================== --- testsuite/gcc.dg/pr51321.c (revision 0) +++ testsuite/gcc.dg/pr51321.c (revision 0) @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +int main () +{ + return (__builtin_types_compatible_p (char[1][], char[1][1])); /* { dg-error "array type has incomplete element type" } */ +} + + Index: c-parser.c =================================================================== --- c-parser.c (revision 181823) +++ c-parser.c (working copy) @@ -6568,9 +6568,16 @@ c_parser_postfix_expression (c_parser *p "expected %<)%>"); { tree e1, e2; + e1 = groktypename (t1, NULL, NULL); + e2 = groktypename (t2, NULL, NULL); + if (e1 == error_mark_node || e2 == error_mark_node) + { + expr.value = error_mark_node; + break; + } - e1 = TYPE_MAIN_VARIANT (groktypename (t1, NULL, NULL)); - e2 = TYPE_MAIN_VARIANT (groktypename (t2, NULL, NULL)); + e1 = TYPE_MAIN_VARIANT (e1); + e2 = TYPE_MAIN_VARIANT (e2); expr.value = comptypes (e1, e2) ? integer_one_node : integer_zero_node;