From patchwork Thu Oct 14 11:59:59 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [C++] Move decltype(nullptr) back to NULLPTR_TYPE tree code
From: Richard Guenther <rguenther@suse.de>
X-Patchwork-Id: 67809
Message-Id: <alpine.LNX.2.00.1010141355470.23074@zhemvz.fhfr.qr>
To: Jason Merrill <jason@redhat.com>
Cc: gcc-patches@gcc.gnu.org
Date: Thu, 14 Oct 2010 13:59:59 +0200 (CEST)

On Wed, 13 Oct 2010, Jason Merrill wrote:

> On 10/13/2010 11:05 AM, Richard Guenther wrote:
> > +     case NULLPTR_TYPE:
> > +       /* No Dwarf representation currently defined.  Fallthru.  */
> > +
> >        case LANG_TYPE:
> >          /* Just use DW_TAG_unspecified_type.  */
> 
> Well, the proposed representation is to use DW_TAG_unspecified_type, as I
> implemented for LANG_TYPE, so I'd leave out the new comment and just add the
> new case.

Ok.

> Otherwise Ok.

Testing revealed I need the following additional hunk, added as ovious,
committed after re-bootstrapping and testing on x86_64-linux.

Thanks,
Richard.

	* pt.c (tsubst): Handle NULLPTR_TYPE.


Index: gcc/cp/pt.c
===================================================================
--- gcc/cp/pt.c.orig	2010-10-14 10:33:07.000000000 +0200
+++ gcc/cp/pt.c	2010-10-14 11:08:36.000000000 +0200
@@ -10097,6 +10097,7 @@ tsubst (tree t, tree args, tsubst_flags_
     case COMPLEX_TYPE:
     case VECTOR_TYPE:
     case BOOLEAN_TYPE:
+    case NULLPTR_TYPE:
     case LANG_TYPE:
       return t;