From patchwork Tue Aug 2 14:06:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 654846 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 3s3dKk0xScz9t5w for ; Wed, 3 Aug 2016 00:06:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=TtzBiSBJ; 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:from :to:cc:subject:date:message-id; q=dns; s=default; b=a8vuLmMaoFTE kROMGr+6JRtQ/V842iwoOiZziG0AJSSjG97xSluI9Dy1v5yCHIVMtzrHFDymOj/h JH5LTOoaReVLcQCc9HSyBbGai5YK+hBCizJ7A3l8FQjnktk8OQS0eu/AicmrNwpI VbNrKPkXYRaLj/pBclf+0UbkUi9pAgY= 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:from :to:cc:subject:date:message-id; s=default; bh=W9ZZjkCkzxjqVKxkSr aDHYGaWEg=; b=TtzBiSBJ50ITPUNSRj58V3liqTHshN11ri5jd0Evg3ixI8MQ3X XyzJYAE8oXuKcE2nLjFx9i1rPtaLE+N7Puw235kYLpJpJ3WLTeCwEB8dY6xsFodT rdM0CRhmPWXqgJEM3SkxN62B8qrNEsMwvgvbAXXz8h0rwtn7c2nnGmbdU= Received: (qmail 108749 invoked by alias); 2 Aug 2016 14:06:26 -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 108733 invoked by uid 89); 2 Aug 2016 14:06:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=H*Ad:U*patrick, H*Ad:D*cx X-HELO: mail-qt0-f194.google.com Received: from mail-qt0-f194.google.com (HELO mail-qt0-f194.google.com) (209.85.216.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 02 Aug 2016 14:06:15 +0000 Received: by mail-qt0-f194.google.com with SMTP id c52so9575736qte.1 for ; Tue, 02 Aug 2016 07:06:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5qr+ZKE7t7lX7eziLJ/6kU5LUitT5xXkC6bVPqVDi0Y=; b=ekv2THb/5D7qH61mh387U8SvVLXMc8LRHP07ISuI1leN2fVJURdGh5Il4BA5bYMf+Z 9arY/2n1i4oOqE0NbMrQlAfqQHA+wV38zREG7zkDAWX+kzSmyjwJiUH3WucGwN5WKnVn zGVN4gML5+UmPr86DfpREsRgTcMl4A8Rm9z6/nZzSv5T33GOM+FIrUs8ZMlp07xwW99s q8JO7G+K9mGtIQWmdpRLniS0k7GZNHWgwCnAreu97w81DdPMKPO34hOKpdZZtotlYKoO U7buMbECJfQrOnZIx+sUj9n9UKHAr5V+3wmk20XkPRwRvxbZJd9FyNF/NSXH0EtNXgmE PxNQ== X-Gm-Message-State: AEkoouu1ma62RcOGKZ/ZohHlvnhyjaL6tVfHN6oCuJwpgRBwg7xYRhxQWn4jMWrF9elA5g== X-Received: by 10.200.50.20 with SMTP id x20mr98477874qta.71.1470146773513; Tue, 02 Aug 2016 07:06:13 -0700 (PDT) Received: from localhost.localdomain (ool-4353abbc.dyn.optonline.net. [67.83.171.188]) by smtp.gmail.com with ESMTPSA id a82sm1433087qkj.0.2016.08.02.07.06.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Aug 2016 07:06:12 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] Fix ICE on invalid variable template instantiation (PR c++/72759) Date: Tue, 2 Aug 2016 10:06:07 -0400 Message-Id: <20160802140607.4611-1-patrick@parcs.ath.cx> This patch fixes PR c++/72759. The problem seems to be that when instantiating a variable template, we fail to propagate error_mark_node when its template arguments are erroneous, and we instead build a bogus TEMPLATE_ID_EXPR which later confuses check_initializer(). Does this look OK to commit after bootstrap + regtesting? gcc/cp/ChangeLog: PR c++/72759 * pt.c (tsubst_qualified_id): Return error_mark_node if template_args is error_mark_node. gcc/testsuite/ChangeLog: PR c++/72759 * g++.dg/cpp1y/pr72759.C: New test. --- gcc/cp/pt.c | 3 +++ gcc/testsuite/g++.dg/cpp1y/pr72759.C | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr72759.C diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a23a05a..6b70a65 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13907,6 +13907,9 @@ tsubst_qualified_id (tree qualified_id, tree args, if (is_template) { + if (template_args == error_mark_node) + return error_mark_node; + if (variable_template_p (expr)) expr = lookup_and_finish_template_variable (expr, template_args, complain); diff --git a/gcc/testsuite/g++.dg/cpp1y/pr72759.C b/gcc/testsuite/g++.dg/cpp1y/pr72759.C new file mode 100644 index 0000000..4af6ea4 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr72759.C @@ -0,0 +1,18 @@ +// PR c++/72759 +// { dg-do compile { target c++14 } } + +template struct SpecPerType; +class Specializer { + public: template static void MbrFnTempl(); + template struct A { static void InnerMemberFn(); }; + void Trigger() { A<0>::InnerMemberFn; } +}; +template <> struct SpecPerType { + using FnType = void *; + template + static constexpr FnType SpecMbrFnPtr = Specializer::MbrFnTempl

; +}; +template void Specializer::A::InnerMemberFn() { + using Spec = SpecPerType; + Spec ErrorSite = Spec::SpecMbrFnPtr; // { dg-error "not declared" } +}