From patchwork Fri Aug 11 05:35:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 800407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-460220-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="cJ6lI4Fe"; dkim-atps=neutral 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 3xTDHv3tKLz9t2Z for ; Fri, 11 Aug 2017 15:35:52 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=Y1zKkeinRNpMNyIh36m7QEl0rwkpwDkK8jw0rCuSjdYkxS Q6cXzJ0neG4i4Gyxfj600d4MkxH8sol75ygcAHcfmpWbjo9hP+zqb2SArQnJM5R5 TSzk/s1SBrNaig5hEIExiEhm6wMk+EtsMdBKSvhycMppPwjwfghP2CuE3Rcno= 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 :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=2rvZj13MDEelIwASPep15gy6Kqg=; b=cJ6lI4FeYI2ykx6k9igM 4B+rTMQWiv2UFIqCjL65355ZUXmbwrgp3n3OoDA+M5Q4fPnwzG0PVbIm8W1q55GF wetdbbGO321auKeEkJ/+N1YmnCsvIBoxV7u3zwdjHF+NzK5YkpItdN+HPPxXosaN FhJSIpwmFTj0EpLf+T03x3k= Received: (qmail 81001 invoked by alias); 11 Aug 2017 05:35:40 -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 78339 invoked by uid 89); 11 Aug 2017 05:35:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy= X-HELO: mail-io0-f181.google.com Received: from mail-io0-f181.google.com (HELO mail-io0-f181.google.com) (209.85.223.181) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 11 Aug 2017 05:35:37 +0000 Received: by mail-io0-f181.google.com with SMTP id j32so16828429iod.0 for ; Thu, 10 Aug 2017 22:35:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=qTK+Le0qlGNPf6Bs3VWXYzeUpn/u3UTss+vWnpMzCjE=; b=SN4j1SENtYNQKhQ1qB708yr5+Ixv/8Ap+Cxh4qtXnLuFQooSykyK81WrF/Xm4ABUGF AUkMBvYSXPxr+oLu6dseGaVNKoxMdQidB3fGFO6xSJoCZV7czsIgLnqiXXkyp6qJv/Gj kWMW6Pw8Tzp8dq5RABtZFXR8ws2MRpyQx6ed785QXALFBdyQGSDjuXTNpqUTTY/kF5WB U9YiM6MoxR44pS9bLfFDBOgJ2UbJyy61IE99E8veGZ4IeDC5Ax5pBTHiXf+R8wIsDFTm +ZFgPgi1X6SmwPlARV/JzRIGrmk1sBhHVS+9bCMuEip6Qa7jWAHrYRCey+4u5jMJwC8h xO9w== X-Gm-Message-State: AIVw1111E62RNSJuIea/xNkn0SBJmZ2//iBTjRazuZY+a2xi+aWi3hAF 7MsUk+/Rwzld10Ynv63fQUYkHFwqyDmubac= X-Received: by 10.107.12.70 with SMTP id w67mr13389883ioi.295.1502429735742; Thu, 10 Aug 2017 22:35:35 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.63.195 with HTTP; Thu, 10 Aug 2017 22:35:14 -0700 (PDT) From: Jason Merrill Date: Thu, 10 Aug 2017 22:35:14 -0700 Message-ID: Subject: C++ PATCH for c++/81671, nullptr_t template parameter To: gcc-patches List X-IsSubscribed: yes We were wrongly checking for nullptr_node rather than nullptr_type. Tested x86_64-pc-linux-gnu, applying to trunk. commit 325d154928a702116006f1ca40806cee600d6a8b Author: Jason Merrill Date: Thu Aug 10 22:05:38 2017 -0700 PR c++/81671 - nullptr_t template parameter * pt.c (convert_nontype_argument): Fix nullptr_t check. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0f899b9..bf1f75d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6879,7 +6879,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) } else if (NULLPTR_TYPE_P (type)) { - if (expr != nullptr_node) + if (!NULLPTR_TYPE_P (TREE_TYPE (expr))) { if (complain & tf_error) error ("%qE is not a valid template argument for type %qT " diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr39.C b/gcc/testsuite/g++.dg/cpp0x/nullptr39.C new file mode 100644 index 0000000..a34a6af --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nullptr39.C @@ -0,0 +1,15 @@ +// PR c++/81671 +// { dg-do compile { target c++11 } } + +namespace std { typedef decltype(nullptr) nullptr_t; } + +template struct Bar +{}; +template struct Bar +{ + template struct Bind { constexpr static int const cb = 0; }; +}; +int foo() +{ + return Bar::Bind::cb; +}