From: Jason Merrill <jason@redhat.com>
Date: Tue, 16 Jan 2018 23:05:39 +0000 (-0500)
Subject: PR c++/83714 - ICE checking return in template.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=035181c3129648328176cbdee69d2a7a66e0a895;p=gcc.git

PR c++/83714 - ICE checking return in template.

	* typeck.c (check_return_expr): Call build_non_dependent_expr.

From-SVN: r256765
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a0119e14640..d378cb2ff3f 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 f0dc03de111..d0adb798278 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 00000000000..670d91a158c
--- /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" }
+}