diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-11-23 16:59:25 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-11-23 16:59:25 +0100 |
| commit | 1b3314ddb15e6e4007035d1f6f823650c9dc70b8 (patch) | |
| tree | b0a519db2d8e0c8c319bc3862eb6aa3d2c8ecf94 | |
| parent | e2df23288c44590ba0ea99f03a7f16b5d113376e (diff) | |
| download | gcc-1b3314ddb15e6e4007035d1f6f823650c9dc70b8.zip gcc-1b3314ddb15e6e4007035d1f6f823650c9dc70b8.tar.gz gcc-1b3314ddb15e6e4007035d1f6f823650c9dc70b8.tar.bz2 | |
re PR c++/71450 (ICE on invalid C++11 code on x86_64-linux-gnu: in tree check: expected record_type or union_type or qual_union_type, have template_type_parm in lookup_base, at cp/search.c:203)
PR c++/71450
* pt.c (tsubst_copy): Return error_mark_node when mark_used
fails, even when complain & tf_error.
* g++.dg/cpp0x/pr71450-1.C: New test.
* g++.dg/cpp0x/pr71450-2.C: New test.
From-SVN: r242767
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr71450-1.C | 16 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr71450-2.C | 14 |
5 files changed, 39 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 66ea957..7418b22 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2016-11-23 Jakub Jelinek <jakub@redhat.com> + PR c++/71450 + * pt.c (tsubst_copy): Return error_mark_node when mark_used + fails, even when complain & tf_error. + PR c++/77739 * cp-gimplify.c (cp_gimplify_tree) <case VEC_INIT_EXPR>: Pass false as handle_invisiref_parm_p to cp_genericize_tree. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 6a68de2..8b0a21c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -14297,7 +14297,7 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl) } else r = t; - if (!mark_used (r, complain) && !(complain & tf_error)) + if (!mark_used (r, complain)) return error_mark_node; return r; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ca673ee..6abbd3b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2016-11-23 Jakub Jelinek <jakub@redhat.com> + PR c++/71450 + * g++.dg/cpp0x/pr71450-1.C: New test. + * g++.dg/cpp0x/pr71450-2.C: New test. + PR c++/77739 * g++.dg/cpp1y/pr77739.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71450-1.C b/gcc/testsuite/g++.dg/cpp0x/pr71450-1.C new file mode 100644 index 0000000..1c68629 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr71450-1.C @@ -0,0 +1,16 @@ +// PR c++/71450 +// { dg-do compile { target c++11 } } + +struct A { A operator+ (A a) { return a; } }; + +template <class T> +void foo (T t) +{ + auto x = t + x; // { dg-error "use of 'x' before deduction of 'auto'" } +} + +int +main () +{ + foo (A ()); +} diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71450-2.C b/gcc/testsuite/g++.dg/cpp0x/pr71450-2.C new file mode 100644 index 0000000..1a7376c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr71450-2.C @@ -0,0 +1,14 @@ +// PR c++/71450 +// { dg-do compile { target c++11 } } + +template <class T> +void foo (T t) +{ + auto x = t + x; // { dg-error "use of 'x' before deduction of 'auto'" } +} + +int +main () +{ + foo (1); +} |