diff options
| author | Jason Merrill <jason@redhat.com> | 2018-01-16 18:05:39 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-01-16 18:05:39 -0500 |
| commit | 035181c3129648328176cbdee69d2a7a66e0a895 (patch) | |
| tree | 52222d646004e51cbef2853abbca932c13a1bbd8 /gcc | |
| parent | a9db08a673d3088d8e60663e2b9643e8ad41b1cf (diff) | |
| download | gcc-035181c3129648328176cbdee69d2a7a66e0a895.zip gcc-035181c3129648328176cbdee69d2a7a66e0a895.tar.gz gcc-035181c3129648328176cbdee69d2a7a66e0a895.tar.bz2 | |
PR c++/83714 - ICE checking return in template.
* typeck.c (check_return_expr): Call build_non_dependent_expr.
From-SVN: r256765
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/alias-decl-61.C | 16 |
3 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a0119e1..d378cb2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-01-16 Jason Merrill <jason@redhat.com> + + PR c++/83714 - ICE checking return in template. + * typeck.c (check_return_expr): Call build_non_dependent_expr. + 2018-01-16 Jakub Jelinek <jakub@redhat.com> PR c++/83817 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index f0dc03d..d0adb79 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -9333,6 +9333,9 @@ check_return_expr (tree retval, bool *no_warning) to undo it so we can try to treat it as an rvalue below. */ retval = maybe_undo_parenthesized_ref (retval); + if (processing_template_decl) + retval = build_non_dependent_expr (retval); + /* Under C++11 [12.8/32 class.copy], a returned lvalue is sometimes treated as an rvalue for the purposes of overload resolution to favor move constructors over copy constructors. diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-61.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-61.C new file mode 100644 index 0000000..670d91a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-61.C @@ -0,0 +1,16 @@ +// PR c++/83714 +// { dg-do compile { target c++11 } } + +class a { + typedef int b; + operator b(); +}; +struct c { + using d = a; +}; +using e = c; + +template <class T> +e f(T) { + return e::d {}; // { dg-error "could not convert" } +} |