From patchwork Tue Sep 17 01:41:16 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paolo Carlini <paolo.carlini@oracle.com>
X-Patchwork-Id: 275349
Return-Path: 
 <gcc-patches-return-349251-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by ozlabs.org (Postfix) with ESMTPS id F381B2C00CC
	for <incoming@patchwork.ozlabs.org>;
	Tue, 17 Sep 2013 11:41:32 +1000 (EST)
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender
	:message-id:date:from:mime-version:to:cc:subject:content-type;
	q=dns; s=default; b=OWq90rIo6gvCpaCe+XBPSHR8mYaYAg8BuXMwH6iDTYl
	1My1s6Lle7mVDoeSD7jpVTWjAKOQA68VYotwxDReVr4EEfEo9vDsKHXGhb3kkjoN
	91r1GrEFNwhvQbkajkTQeStvEW6AXuHRkup8spltBEw3boZGUe+a7z0Sb10nxXtQ
	=
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
	:message-id:date:from:mime-version:to:cc:subject:content-type;
	s=default; bh=PiG0fracDbwdqJtm8AE5eQ0xwnQ=; b=wB4LC1O+k+itaFoDG
	AZ6p0Ico5j1NbaNJnkPRjVxFMQBOasSzRRtxC3dXfUGdnaVT1ckYmmTvdK5QiyBF
	xQ9tMSr1oLwJ9BRVVEcMw0N3+9s3XERbcVH3IbHCZ8LhCaU1+4IAZZaIzGAyBiIk
	Yce8tWbaxfq2WsrRktQhKQ+9K4=
Received: (qmail 20123 invoked by alias); 17 Sep 2013 01:41:25 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: <mailto:gcc-patches-unsubscribe-##L=##H@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org
Received: (qmail 20111 invoked by uid 89); 17 Sep 2013 01:41:24 -0000
Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com)
	(141.146.126.69) by sourceware.org
	(qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted)
	ESMTPS; Tue, 17 Sep 2013 01:41:24 +0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-6.3 required=5.0 tests=AWL, BAYES_00,
	RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD,
	SPF_PASS, UNPARSEABLE_RELAY autolearn=ham version=3.3.2
X-HELO: aserp1040.oracle.com
Received: from ucsinet21.oracle.com (ucsinet21.oracle.com
	[156.151.31.93])	by aserp1040.oracle.com
	(Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id
	r8H1fKxP014013	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA
	bits=256 verify=OK); Tue, 17 Sep 2013 01:41:21 GMT
Received: from userz7021.oracle.com (userz7021.oracle.com
	[156.151.31.85])	by ucsinet21.oracle.com (8.14.4+Sun/8.14.4)
	with ESMTP id r8H1fJwI010904	(version=TLSv1/SSLv3
	cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Tue, 17 Sep 2013 01:41:20 GMT
Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53])	by
	userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id
	r8H1fJ9a010885; Tue, 17 Sep 2013 01:41:19 GMT
Received: from poldo4.casa (/79.33.220.231)	by default (Oracle Beehive
	Gateway v4.0)	with ESMTP ; Mon, 16 Sep 2013 18:41:19 -0700
Message-ID: <5237B33C.9080002@oracle.com>
Date: Tue, 17 Sep 2013 03:41:16 +0200
From: Paolo Carlini <paolo.carlini@oracle.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:17.0) Gecko/20130801 Thunderbird/17.0.8
MIME-Version: 1.0
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
CC: Jason Merrill <jason@redhat.com>
Subject: [C++ Patch] PR 58435
X-IsSubscribed: yes

Hi,

for this kind of code:

template <template <typename> class F, typename T> struct apply
{ typedef F<T> type; };

template <typename T> using map = const T;

static_assert(std::is_same<apply<map, int>::type, const int>::value, "");

line #11542 of pt.c, in tsubst is reached:

         r = lookup_template_class (arg,
                        argvec, in_decl,
                        DECL_CONTEXT (arg),
                         /*entering_scope=*/0,
                        complain);
         return cp_build_qualified_type_real
           (r, cp_type_quals (t), complain);

for the 'typedef F<T> type;' with t, the typedef, which evidently has 
cp_type_quals (t) == 0, thus unqualified. The information about const T 
in the alias declaration is contained in r. Thus I believe we have 
simply to OR the two cp_type_quals, like we do in other cases. We also 
OR for case [TEMPLATE_TYPE_PARM] a few lines above.

Tested x86_64-linux.

Thanks!
Paolo.

////////////////////////
/cp
2013-09-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58435
	* pt.c (tsubst, [BOUND_TEMPLATE_TEMPLATE_PARM]): Take into account
	the cp_type_quals (r) too.

/testsuite
2013-09-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58435
	* g++.dg/cpp0x/alias-decl-38.C: New.

Index: cp/pt.c
===================================================================
--- cp/pt.c	(revision 202641)
+++ cp/pt.c	(working copy)
@@ -11540,7 +11540,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain
 					    /*entering_scope=*/0,
 					   complain);
 		return cp_build_qualified_type_real
-		  (r, cp_type_quals (t), complain);
+		  (r, cp_type_quals (t) | cp_type_quals (r), complain);
 	      }
 	    else
 	      /* TEMPLATE_TEMPLATE_PARM or TEMPLATE_PARM_INDEX.  */
Index: testsuite/g++.dg/cpp0x/alias-decl-38.C
===================================================================
--- testsuite/g++.dg/cpp0x/alias-decl-38.C	(revision 0)
+++ testsuite/g++.dg/cpp0x/alias-decl-38.C	(working copy)
@@ -0,0 +1,41 @@
+// PR c++/58435
+// { dg-do compile { target c++11 } }
+
+template<typename T, typename U>
+struct same { static const bool value = false; };
+template<typename T>
+struct same<T, T> { static const bool value = true; };
+
+template <template <typename> class F, typename T> struct apply
+{ typedef F<T> type; };
+template <template <typename> class F, typename T> struct applyc
+{ typedef const F<T> type; };
+template <template <typename> class F, typename T> struct applyv
+{ typedef volatile F<T> type; };
+template <template <typename> class F, typename T> struct applycv
+{ typedef const volatile F<T> type; };
+
+template <typename T> using map = T;
+template <typename T> using mapc = const T;
+template <typename T> using mapv = volatile T;
+template <typename T> using mapcv = const volatile T;
+
+static_assert(same<apply<map, int>::type, int>::value, "");
+static_assert(same<apply<mapc, int>::type, const int>::value, "");
+static_assert(same<apply<mapv, int>::type, volatile int>::value, "");
+static_assert(same<apply<mapcv, int>::type, const volatile int>::value, "");
+
+static_assert(same<applyc<map, int>::type, const int>::value, "");
+static_assert(same<applyc<mapc, int>::type, const int>::value, "");
+static_assert(same<applyc<mapv, int>::type, const volatile int>::value, "");
+static_assert(same<applyc<mapcv, int>::type, const volatile int>::value, "");
+
+static_assert(same<applyv<map, int>::type, volatile int>::value, "");
+static_assert(same<applyv<mapc, int>::type, const volatile int>::value, "");
+static_assert(same<applyv<mapv, int>::type, volatile int>::value, "");
+static_assert(same<applyv<mapcv, int>::type, const volatile int>::value, "");
+
+static_assert(same<applycv<map, int>::type, const volatile int>::value, "");
+static_assert(same<applycv<mapc, int>::type, const volatile int>::value, "");
+static_assert(same<applycv<mapv, int>::type, const volatile int>::value, "");
+static_assert(same<applycv<mapcv, int>::type, const volatile int>::value, "");