From patchwork Wed Mar 11 01:59:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 1252525 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; dmarc=none (p=none dis=none) header.from=gcc.gnu.org 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=FgqahjE/; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DB3HqLSs; dkim-atps=neutral Received: from sourceware.org (server2.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 48cZrz1QcWz9sPR for ; Wed, 11 Mar 2020 12:59:24 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E90B0395B077; Wed, 11 Mar 2020 01:59:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E90B0395B077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1583891961; bh=yiwDCDkjoL6uPYHC0WdBTsuhT7wlPrTns8UBYqV8Hu0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FgqahjE/b0CGYRujA2QTLSSPkDrVBzkEcNnlThLiHFVRzOz2VcXPn9Y5humxs8zW9 hRi1MweJVX08djyA31XbEWvsIya9RaPoVhk3P2eUwnhbo5C9zywXwGi1BCV5MlcVAE A4D+qqxn7pNBBgMaUt+8fkuVEPVmy6OlwXaqIvpQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id 4B623395B072 for ; Wed, 11 Mar 2020 01:59:18 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583891958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiwDCDkjoL6uPYHC0WdBTsuhT7wlPrTns8UBYqV8Hu0=; b=DB3HqLSsI47YHrGutRUvGynbPH6uGdt/viQ9F88zdqcZrLe47flR/AuB1PXOPSCDDTE8F+ 2+WeO0I8xBsaxwOlL2TH3Nx7WE1gVqxrx3aSMpFlTDKr+1EGm6mNGXXuVGjC5DRA1qieUi PxBTUuWEF2OBaTanUAPL5JWq7CzRrjk= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-209-pT17JBVCOGe_YuzaoxWsmQ-1; Tue, 10 Mar 2020 21:59:16 -0400 X-MC-Unique: pT17JBVCOGe_YuzaoxWsmQ-1 Received: by mail-qt1-f198.google.com with SMTP id 88so226332qtb.18 for ; Tue, 10 Mar 2020 18:59:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Xd9o/dhkRUhKQ2PpCzutop1v4C/xjOcDS1E3TQdsP+M=; b=RuRzvR3rFAKH/LiWvoIjFnOnleV6c1YJ9xqXkeoP36fxSDfWxVvk/UK53lGAapyI6e E+qrm45508X+67cEDExZOzHxaa5QD2T7yhbqaC+e8rpUfXGpTqKWigz6OvZzN1E3+/mq 5sNDjqGl3oGLszg5mJUeyWYU5jVknmlb1v+meIIIEonoOrK45rNEKNQQJf3ITqwf0Jgm fZJLdIwKlyeKm/eH8HXbiVwBLl3V597j+o6TtQJLnZCCd9UIAjc6lKOtcB3lUriuahiq VsbGflgIp/201gFD2F853UYnK/OHE7pXn8JAECYSlKCLirIckUe7S4kbxHGA0ETfQKuA q2Fw== X-Gm-Message-State: ANhLgQ1uR9gNj93p0wzlmF6MzPeg5IrU+Sn+EDWvv+B2Cnuyu7bjiidY M9wR7DpdMl3eiNFEaMltTWPl3nd9R2x80Wcl8df7kJ7ZtXHURu0u/Vm8KjWdUTrT4fqfio88s3t 4NyU9dD245zjb2C5fLA== X-Received: by 2002:a37:8087:: with SMTP id b129mr636666qkd.465.1583891955490; Tue, 10 Mar 2020 18:59:15 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvNaaNV1Npmzy3LfG2dlsAPGaITsADWQSr9gIn4Z3h4FsikAkNH9qo07BFhWSBL2t8JYpHg7g== X-Received: by 2002:a37:8087:: with SMTP id b129mr636656qkd.465.1583891955080; Tue, 10 Mar 2020 18:59:15 -0700 (PDT) Received: from barrymore.redhat.com (209-6-216-142.s141.c3-0.smr-cbr1.sbo-smr.ma.cable.rcncustomer.com. [209.6.216.142]) by smtp.gmail.com with ESMTPSA id j193sm6698061qke.22.2020.03.10.18.59.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 18:59:14 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: Fix ICE with omitted template args [PR93956]. Date: Tue, 10 Mar 2020 21:59:13 -0400 Message-Id: <20200311015913.20762-1-jason@redhat.com> X-Mailer: git-send-email 2.18.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-27.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS 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: Jason Merrill via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: Jason Merrill Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" reshape_init only wants to work on BRACE_ENCLOSED_INITIALIZER_P, i.e. raw initializer lists, and here was getting a CONSTRUCTOR that had already been processed for type A. maybe_aggr_guide should also use that test. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog 2020-03-10 Jason Merrill PR c++/93956 * pt.c (maybe_aggr_guide): Check BRACE_ENCLOSED_INITIALIZER_P. --- gcc/cp/pt.c | 2 +- gcc/testsuite/g++.dg/cpp1z/class-deduction70.C | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/class-deduction70.C base-commit: b269a014771776f860730874095dffb34839a466 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 49ee3920049..179716b5680 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -28182,7 +28182,7 @@ maybe_aggr_guide (tree tmpl, tree init, vec *args) tsubst_flags_t complain = tf_none; tree parms = NULL_TREE; - if (TREE_CODE (init) == CONSTRUCTOR) + if (BRACE_ENCLOSED_INITIALIZER_P (init)) { init = reshape_init (type, init, complain); if (init == error_mark_node) diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction70.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction70.C new file mode 100644 index 00000000000..f14bdf0b8ec --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction70.C @@ -0,0 +1,7 @@ +// PR c++/93596 + +template struct A {}; +template struct B {}; +template struct C { + void foo () { B a = A { foo }; } // { dg-error "" } +};