From: mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 26 Feb 2015 15:03:23 +0000 (+0000)
Subject: 	PR c++/65202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10fb495c3be1b73134ae3e3f6d60acc8ea81eaed;p=thirdparty%2Fgcc.git

	PR c++/65202
	* constexpr.c (cxx_eval_constant_expression): Don't evaluate
	a RETURN_EXPR if its operand is null.

	* g++.dg/cpp1y/pr65202.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221015 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ebe84c6dc693..7fcbcb93df04 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-26  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/65202
+	* constexpr.c (cxx_eval_constant_expression): Don't evaluate
+	a RETURN_EXPR if its operand is null.
+
 2015-02-25  Jason Merrill  <jason@redhat.com>
 
 	PR c++/65209
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 32a23ff73805..f7e8ce949f33 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -3113,9 +3113,10 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
       break;
 
     case RETURN_EXPR:
-      r = cxx_eval_constant_expression (ctx, TREE_OPERAND (t, 0),
-					lval,
-					non_constant_p, overflow_p);
+      if (TREE_OPERAND (t, 0) != NULL_TREE)
+	r = cxx_eval_constant_expression (ctx, TREE_OPERAND (t, 0),
+					  lval,
+					  non_constant_p, overflow_p);
       *jump_target = t;
       break;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4f9ce8e08b6e..41c0685db708 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-26  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/65202
+	* g++.dg/cpp1y/pr65202.C: New test.
+
 2015-02-26  Tom de Vries  <tom@codesourcery.com>
 
 	* g++.dg/gcov/gcov-14.C: Add cleanup of iostream.gcov, ostream.gcov and
diff --git a/gcc/testsuite/g++.dg/cpp1y/pr65202.C b/gcc/testsuite/g++.dg/cpp1y/pr65202.C
new file mode 100644
index 000000000000..602b264b3028
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/pr65202.C
@@ -0,0 +1,26 @@
+// // PR c++/65202
+// { dg-do compile { target c++14 } }
+
+template <typename T> struct is_move_constructible;
+template <typename T> struct is_move_assignable;
+template <int, typename T> using enable_if_t = int;
+namespace adl {
+template <
+    typename L, typename R,
+    enable_if_t<is_move_constructible<L>() && is_move_assignable<L>(), int>...>
+constexpr auto adl_swap(L &l, R &r) -> decltype(swap(l, r)) {
+  return;
+}
+template <typename L, typename R>
+auto swap(L &l, R &r) noexcept(noexcept(adl::adl_swap(l, r)))
+    -> decltype(adl::adl_swap(l, r));
+namespace ns {
+template <typename T> struct foo {};
+template <typename T> void swap(foo<T> &, foo<T> &);
+struct bar;
+
+int main()
+{
+    foo<ns::bar> f;
+    adl::swap(f, f)
+} // { dg-error "" }