From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39551 invoked by alias); 6 May 2019 16:32:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 39542 invoked by uid 89); 6 May 2019 16:32:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=HX-Spam-Relays-External:redhat.com, H*RU:redhat.com, H*r:redhat.com, HX-Languages-Length:1595 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; Mon, 06 May 2019 16:32:09 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF988308A951 for ; Mon, 6 May 2019 16:32:08 +0000 (UTC) Received: from redhat.com (ovpn-123-232.rdu2.redhat.com [10.10.123.232]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B8D360C4D; Mon, 6 May 2019 16:32:07 +0000 (UTC) Date: Mon, 06 May 2019 16:32:00 -0000 From: Marek Polacek To: GCC Patches , Jason Merrill Subject: C++ PATCH for c++/90265 - ICE with generic lambda Message-ID: <20190506163206.GF4334@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.11.4 (2019-03-13) X-SW-Source: 2019-05/txt/msg00232.txt.bz2 This new code vec_safe_push (call_args, (*call_args)[nargs-1]); doesn't seem to work well because "obj" points to garbage after the vec_safe_reserve call: template inline T * vec_safe_push (vec *&v, const T &obj CXX_MEM_STAT_INFO) { vec_safe_reserve (v, 1, false PASS_MEM_STAT); return v->quick_push (obj); } But using a dedicated variable works even when vec_safe_reserve actually extends. Bootstrapped/regtested on x86_64-linux, ok for trunk/9? 2019-05-06 Marek Polacek PR c++/90265 - ICE with generic lambda. * pt.c (tsubst_copy_and_build): Use a dedicated variable for the last element in the vector. * g++.dg/cpp1y/lambda-generic-90265.C: New test. diff --git gcc/cp/pt.c gcc/cp/pt.c index 3e8c70b0d15..2f2066e297c 100644 --- gcc/cp/pt.c +++ gcc/cp/pt.c @@ -18881,7 +18881,8 @@ tsubst_copy_and_build (tree t, if (thisarg) { /* Shift the other args over to make room. */ - vec_safe_push (call_args, (*call_args)[nargs-1]); + tree last = (*call_args)[nargs - 1]; + vec_safe_push (call_args, last); for (int i = nargs-1; i > 0; --i) (*call_args)[i] = (*call_args)[i-1]; (*call_args)[0] = thisarg; diff --git gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C new file mode 100644 index 00000000000..d9ab9b7f55f --- /dev/null +++ gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C @@ -0,0 +1,4 @@ +// PR c++/90265 +// { dg-do compile { target c++14 } } + +void (*a)(int, int, int, void *) = [](auto, auto, auto, auto) {};