/cp

2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* pt.c (convert_nontype_argument): Handle NULLPTR_TYPE.

/testsuite
2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/nullptr25.C: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@179199 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index eb870c7..fe7589e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       * pt.c (convert_nontype_argument): Handle NULLPTR_TYPE.
+
+2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
        PR c++/26747
        * cp-gimplify.c (get_bc_label): Remove obsolete diagnostics.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ebadebf..2c398e0 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5951,6 +5951,16 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
       if (expr == error_mark_node)
        return expr;
     }
+  else if (NULLPTR_TYPE_P (type))
+    {
+      if (expr != nullptr_node)
+       {
+         error ("%qE is not a valid template argument for type %qT "
+                "because it is of type %qT", expr, type, TREE_TYPE (expr));
+         return NULL_TREE;
+       }
+      return expr;
+    }
   /* A template non-type parameter must be one of the above.  */
   else
     gcc_unreachable ();

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6caed7a..dde9c62 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * g++.dg/cpp0x/nullptr25.C: New.
+
 2011-09-26  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/50472

diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr25.C b/gcc/testsuite/g++.dg/cpp0x/nullptr25.C
new file mode 100644 (file)
index 0000000..b8a7f45
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr25.C
@@ -0,0 +1,6 @@
+// { dg-options -std=c++0x }
+
+template<decltype(nullptr)>
+struct nt{};
+
+nt<nullptr> x;