diff options
| author | Marek Polacek <polacek@redhat.com> | 2013-12-23 12:14:56 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2013-12-23 12:14:56 +0000 |
| commit | ae8310ec6eba51ef6d39d3fd25ffcec7f9da3759 (patch) | |
| tree | c930c8d6bf8525eccaa0e1b6a99bfea98bd244f7 | |
| parent | b654717c8d8f06343a494dec24eb27275abc2e1d (diff) | |
| download | gcc-ae8310ec6eba51ef6d39d3fd25ffcec7f9da3759.zip gcc-ae8310ec6eba51ef6d39d3fd25ffcec7f9da3759.tar.gz gcc-ae8310ec6eba51ef6d39d3fd25ffcec7f9da3759.tar.bz2 | |
re PR c++/59111 ([c++11] ICE on invalid usage of auto in return type)
PR c++/59111
cp/
* search.c (lookup_conversions): Return NULL_TREE if !CLASS_TYPE_P.
testsuite/
* g++.dg/cpp0x/pr59111.C: New test.
* g++.dg/cpp1y/pr59110.C: New test.
From-SVN: r206177
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/search.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr59111.C | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/pr59110.C | 4 |
5 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9802263..e4896d5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-23 Marek Polacek <polacek@redhat.com> + + PR c++/59111 + * search.c (lookup_conversions): Return NULL_TREE if !CLASS_TYPE_P. + 2013-12-20 Trevor saunders <tsaunders@mozilla.com> * semantics.c (build_anon_member_initialization): Replace diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 166ac11..b700be9 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -2506,7 +2506,7 @@ lookup_conversions (tree type) tree list = NULL_TREE; complete_type (type); - if (!TYPE_BINFO (type)) + if (!CLASS_TYPE_P (type) || !TYPE_BINFO (type)) return NULL_TREE; lookup_conversions_r (TYPE_BINFO (type), 0, 0, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d0efe2a..fbd5ba1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-12-23 Marek Polacek <polacek@redhat.com> + + PR c++/59111 + * g++.dg/cpp0x/pr59111.C: New test. + * g++.dg/cpp1y/pr59110.C: New test. + 2013-12-22 Uros Bizjak <ubizjak@gmail.com> * gcc.target/x86_64/abi/callabi/func-2a.c (dg-do): Remove diff --git a/gcc/testsuite/g++.dg/cpp0x/pr59111.C b/gcc/testsuite/g++.dg/cpp0x/pr59111.C new file mode 100644 index 0000000..14b45b1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr59111.C @@ -0,0 +1,5 @@ +// PR c++/59111 +// { dg-do compile { target c++11 } } + +auto& foo(); // { dg-error "type specifier without trailing return type" } +int i = foo(); // { dg-error "cannot convert" } diff --git a/gcc/testsuite/g++.dg/cpp1y/pr59110.C b/gcc/testsuite/g++.dg/cpp1y/pr59110.C new file mode 100644 index 0000000..dbbfa9b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr59110.C @@ -0,0 +1,4 @@ +// PR c++/59110 +// { dg-options "-std=c++1y" } + +int i = *(auto*)0; // { dg-error "cannot convert" } |