re PR c++/47199 ([C++0x] ICE: expected class 'type', have 'declaration' (function_dec...

	PR c++/47199
	* semantics.c (cxx_eval_call_expression): Call
	cxx_eval_constant_expression in trivial shortcut.

From-SVN: r170356

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4ce3f27..9fde00c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-20  Jason Merrill  <jason@redhat.com>
 
+       PR c++/47199
+       * semantics.c (cxx_eval_call_expression): Call
+       cxx_eval_constant_expression in trivial shortcut.
+
        PR c++/46831
        * call.c (convert_class_to_reference): Don't try to set up a
        second conv sequence for non-viable candidates.

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 8944690..b7ed525 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -6021,7 +6021,11 @@ cxx_eval_call_expression (const constexpr_call *old_call, tree t,
 
   /* Shortcut trivial copy constructor/op=.  */
   if (call_expr_nargs (t) == 2 && trivial_fn_p (fun))
-    return convert_from_reference (get_nth_callarg (t, 1));
+    {
+      tree arg = convert_from_reference (get_nth_callarg (t, 1));
+      return cxx_eval_constant_expression (old_call, arg, allow_non_constant,
+                                          addr, non_constant_p);
+    }
 
   /* If in direct recursive call, optimize definition search.  */
   if (old_call != NULL && old_call->fundef->decl == fun)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index db45d88..77b0bef 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-20  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/constexpr-ctor7.C: New.
+
        * g++.dg/cpp0x/fntmpdefarg2.C: New.
 
        * g++.dg/overload/conv-op1.C: New.

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C
new file mode 100644 (file)
index 0000000..8338bf1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C
@@ -0,0 +1,17 @@
+// PR c++/47199
+// { dg-options "-std=c++0x -fno-elide-constructors" }
+
+template < int > struct S
+{
+  constexpr S (int r):rr (r)
+  {
+  }
+  S (const S &) = default;
+  static constexpr S s ()
+  {
+    return -1;
+  }
+  int rr;
+};
+
+static const int d = S < 0 >::s ().rr;