From patchwork Wed Jun 7 09:01:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 772281 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wjMwz4mW0z9sNM for ; Wed, 7 Jun 2017 19:01:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="D3u1CcAd"; dkim-atps=neutral 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:cc:subject:message-id:reply-to:mime-version :content-type; q=dns; s=default; b=ewK155vSa0BUykGjR93JN6BQkLa6N TO67e7fCmexo5JGqBbnpu8c5W2MYx+xLbxGpu0pHPYey7uy5mzIiRi8hH9rudFAW nfCYgCZw2Pv3oRFXRszYPW4Y1SG0yRVFGsR2lq01PkJznA63wVUzCX19Pqvn4Oub jCh+mbv+J46uUE= 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:cc:subject:message-id:reply-to:mime-version :content-type; s=default; bh=8GXu8lCrcYdDGI1+uZioMyi79Mg=; b=D3u 1CcAdzeVEcpM2j58ZH7USsQ50C8kJw+HiEXowU+uZnEsV3rh7pqxoklyQykWlbBS MeyBS29FmaVTlq+5v43wCfU1Ja1Va21WfyTkxHYXKWb4KF46wGf1lMfrHh1h8xGu c7MeTnYdfxk3ZQFHgeMwd7vWCxh9qsPZdDX4nGP8= Received: (qmail 127838 invoked by alias); 7 Jun 2017 09:01:05 -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 126971 invoked by uid 89); 7 Jun 2017 09:01:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 07 Jun 2017 09:01:03 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E08B085359; Wed, 7 Jun 2017 09:01:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E08B085359 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jakub@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E08B085359 Received: from tucnak.zalov.cz (ovpn-117-9.ams2.redhat.com [10.36.117.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6633D60467; Wed, 7 Jun 2017 09:01:05 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id v57913hu032203; Wed, 7 Jun 2017 11:01:03 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id v579115M032191; Wed, 7 Jun 2017 11:01:01 +0200 Date: Wed, 7 Jun 2017 11:01:01 +0200 From: Jakub Jelinek To: Nathan Sidwell , Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [C++ PATCH] Fix genericization ICE (PR c++/80984) Message-ID: <20170607090101.GQ2154@tucnak> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) X-IsSubscribed: yes Hi! As the testcase shows, BLOCK_VARS of the outermost scope can contain decls other than VAR_DECL that have DECL_NAME identical to what we are looking for, in this case a LABEL_DECL. The code is looking for the VAR_DECL that has been NRV optimized, and while e.g. DECL_HAS_VALUE_EXPR_P is allowed on all of VAR_DECL, PARM_DECL and RESULT_DECL, BLOCK_VARS should not contain the latter two. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk and release branches? 2017-06-07 Jakub Jelinek PR c++/80984 * cp-gimplify.c (cp_genericize): Only look for VAR_DECLs in BLOCK_VARS (outer) chain. (cxx_omp_const_qual_no_mutable): Likewise. * g++.dg/opt/nrv18.C: New test. Jakub --- gcc/cp/cp-gimplify.c.jj 2017-05-22 20:49:04.000000000 +0200 +++ gcc/cp/cp-gimplify.c 2017-06-06 10:11:22.780850949 +0200 @@ -1590,7 +1590,8 @@ cp_genericize (tree fndecl) if (outer) for (var = BLOCK_VARS (outer); var; var = DECL_CHAIN (var)) - if (DECL_NAME (t) == DECL_NAME (var) + if (VAR_P (var) + && DECL_NAME (t) == DECL_NAME (var) && DECL_HAS_VALUE_EXPR_P (var) && DECL_VALUE_EXPR (var) == t) { @@ -1837,7 +1838,8 @@ cxx_omp_const_qual_no_mutable (tree decl if (outer) for (var = BLOCK_VARS (outer); var; var = DECL_CHAIN (var)) - if (DECL_NAME (decl) == DECL_NAME (var) + if (VAR_P (var) + && DECL_NAME (decl) == DECL_NAME (var) && (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (var)))) { --- gcc/testsuite/g++.dg/opt/nrv18.C.jj 2017-06-06 10:13:00.925650648 +0200 +++ gcc/testsuite/g++.dg/opt/nrv18.C 2017-06-06 10:12:10.670265267 +0200 @@ -0,0 +1,12 @@ +// PR c++/80984 +// { dg-do compile } + +struct A { ~A (); }; + +A +foo () +{ + A a; +a: + return a; +}