diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2016-04-21 19:42:34 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2016-04-21 19:42:34 +0000 |
| commit | 2070009860d832140d81894a88c9b01657941caa (patch) | |
| tree | 750b1cb313f83c093aac6df53e27988eb11e276a /gcc | |
| parent | aedf4e122b56aa6bf977e42adf198b49511aa0f3 (diff) | |
| download | gcc-2070009860d832140d81894a88c9b01657941caa.zip gcc-2070009860d832140d81894a88c9b01657941caa.tar.gz gcc-2070009860d832140d81894a88c9b01657941caa.tar.bz2 | |
re PR c++/70540 (ICE on invalid code in cxx_incomplete_type_diagnostic, at cp/typeck2.c:569)
/cp
2016-04-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/70540
* semantics.c (process_outer_var_ref): Unconditionally return
error_mark_node when mark_used returns false.
/testsuite
2016-04-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/70540
* g++.dg/cpp0x/auto48.C: New.
From-SVN: r235348
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/auto48.C | 8 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8efaa80..5a9ad97 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-04-21 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/70540 + * semantics.c (process_outer_var_ref): Unconditionally return + error_mark_node when mark_used returns false. + 2016-04-21 Marek Polacek <polacek@redhat.com> PR c++/70513 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 93b39ac..2365a73 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3281,7 +3281,7 @@ process_outer_var_ref (tree decl, tsubst_flags_t complain) tree initializer = convert_from_reference (decl); /* Mark it as used now even if the use is ill-formed. */ - if (!mark_used (decl, complain) && !(complain & tf_error)) + if (!mark_used (decl, complain)) return error_mark_node; bool saw_generic_lambda = false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 52257e5..0227f70 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-04-21 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/70540 + * g++.dg/cpp0x/auto48.C: New. + 2016-04-21 Marek Polacek <polacek@redhat.com> PR c++/70513 diff --git a/gcc/testsuite/g++.dg/cpp0x/auto48.C b/gcc/testsuite/g++.dg/cpp0x/auto48.C new file mode 100644 index 0000000..3e0b9ff --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/auto48.C @@ -0,0 +1,8 @@ +// PR c++/70540 +// { dg-do compile { target c++11 } } + +void +foo () +{ + auto f = [&] { return f; }; // { dg-error "before deduction" } +} |