aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/nullptr29.C4
-rw-r--r--gcc/tree.c2
4 files changed, 17 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b0ebab..3e8bfc2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-09 Jason Merrill <jason@redhat.com>
+
+ PR c++/53882
+ * tree.c (type_contains_placeholder_1): Handle NULLPTR_TYPE.
+ (type_hash_eq): Likewise.
+
2012-07-09 Tom de Vries <tom@codesourcery.com>
Richard Guenther <rguenther@suse.de>
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd23351..07187eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-09 Jason Merrill <jason@redhat.com>
+
+ PR c++/53882
+ * g++.dg/cpp0x/nullptr29.C: New.
+
2012-07-09 Tom de Vries <tom@codesourcery.com>
Richard Guenther <rguenther@suse.de>
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr29.C b/gcc/testsuite/g++.dg/cpp0x/nullptr29.C
new file mode 100644
index 0000000..a8e35a9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr29.C
@@ -0,0 +1,4 @@
+// PR c++/53882
+// { dg-options "-std=gnu++11 -O" }
+
+void f(decltype(nullptr) &__restrict np) { }
diff --git a/gcc/tree.c b/gcc/tree.c
index 9be0c9a..f92f070 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -2980,6 +2980,7 @@ type_contains_placeholder_1 (const_tree type)
case METHOD_TYPE:
case FUNCTION_TYPE:
case VECTOR_TYPE:
+ case NULLPTR_TYPE:
return false;
case INTEGER_TYPE:
@@ -6188,6 +6189,7 @@ type_hash_eq (const void *va, const void *vb)
case COMPLEX_TYPE:
case POINTER_TYPE:
case REFERENCE_TYPE:
+ case NULLPTR_TYPE:
return 1;
case VECTOR_TYPE: