diff options
| author | Jason Merrill <jason@redhat.com> | 2012-07-09 10:11:01 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-07-09 10:11:01 -0400 |
| commit | 06e3e32bcd55600300f4a393a77bb582ff68cdf9 (patch) | |
| tree | 021b701cb646698a039d5ccd1a70274ab3b26324 /gcc | |
| parent | 065dd77587faa7359d6a56dcae25e2c22843f2a3 (diff) | |
| download | gcc-06e3e32bcd55600300f4a393a77bb582ff68cdf9.zip gcc-06e3e32bcd55600300f4a393a77bb582ff68cdf9.tar.gz gcc-06e3e32bcd55600300f4a393a77bb582ff68cdf9.tar.bz2 | |
re PR c++/53882 (ICE in type_contains_placeholder_1, at tree.c:3015)
PR c++/53882
* tree.c (type_contains_placeholder_1): Handle NULLPTR_TYPE.
(type_hash_eq): Likewise.
From-SVN: r189386
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nullptr29.C | 4 | ||||
| -rw-r--r-- | gcc/tree.c | 2 |
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) { } @@ -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: |