From patchwork Thu Nov 11 06:19:21 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: C++ PATCH for c++/46420 (C++0x ICE with functional cast in
 initializer)
Date: Wed, 10 Nov 2010 20:19:21 -0000
From: Jason Merrill <jason@redhat.com>
X-Patchwork-Id: 70776
Message-Id: <4CDB8AE9.4010506@redhat.com>
To: gcc-patches List <gcc-patches@gcc.gnu.org>

We currently call fold_non_dependent_expr on initializers, which isn't 
quite right; we should only call it in places that require a constant 
expression.  As a result, in C++0x mode we can end up with a TARGET_EXPR 
wrapped around a constant CONSTRUCTOR.  For now, it's easier to just 
deal with it.

Tested x86_64-pc-linux-gnu, applied to trunk.
commit c666ae011ac0b63f554102c6fb811a7319421485
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Nov 10 21:15:06 2010 -0600

    	PR c++/46420
    	* pt.c (tsubst_copy_and_build) [TARGET_EXPR]: New case.
    	[CONSTRUCTOR]: Use the tsubsted type.


diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7a06038..56b7543 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13197,6 +13197,7 @@ tsubst_copy_and_build (tree t,
 	if (TREE_HAS_CONSTRUCTOR (t))
 	  return finish_compound_literal (type, r);
 
+	TREE_TYPE (r) = type;
 	return r;
       }
 
@@ -13316,6 +13317,12 @@ tsubst_copy_and_build (tree t,
 	return build_lambda_object (r);
       }
 
+    case TARGET_EXPR:
+      /* We can get here for a constant initializer of non-dependent type.
+         FIXME stop folding in cp_parser_initializer_clause.  */
+      gcc_assert (TREE_CONSTANT (t));
+      return get_target_expr (RECUR (TARGET_EXPR_INITIAL (t)));
+
     default:
       /* Handle Objective-C++ constructs, if appropriate.  */
       {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C
new file mode 100644
index 0000000..757a6e3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C
@@ -0,0 +1,13 @@
+// PR c++/46420
+// { dg-options -std=c++0x }
+
+template<typename> class vector { };
+struct A{};
+template <class T1>
+void complete_test(vector<T1> data1){
+        A drop=A();
+}
+int main(){
+  vector<double> vect1;
+  complete_test(vect1);
+}