re PR c++/51029 ([C++0x] [4.7 Regression] ICE with -std=c++0x)

	PR c++/51029
	* class.c (build_base_path): Don't ICE in fold_non_dependent_expr.

From-SVN: r181225

gcc/cp/ChangeLog

 2011-11-09  Jason Merrill  <jason@redhat.com>
 
+	PR c++/51029
+	* class.c (build_base_path): Don't ICE in fold_non_dependent_expr.
+
 	* Make-lang.in (check_g++_parallelize): Add dg-torture.exp.
 	(check-c++0x): Obsolete.
 

gcc/cp/class.c

@@ -359,6 +359,11 @@ build_base_path (enum tree_code code,
 	 V_BINFO.  That offset is an entry in D_BINFO's vtable.  */
       tree v_offset;
 
+      /* In a constructor template, current_in_charge_parm isn't set,
+	 and we might end up here via fold_non_dependent_expr.  */
+      if (fixed_type_p < 0 && !(cfun && current_in_charge_parm))
+	fixed_type_p = 0;
+
       if (fixed_type_p < 0 && in_base_initializer)
 	{
 	  /* In a base member initializer, we cannot rely on the

gcc/testsuite/ChangeLog

+2011-11-09  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51029
+	* g++.dg/template/virtual1.C: New.
+
 2011-11-08  Jason Merrill  <jason@redhat.com>
 
 	Run most C++ tests in both C++98 and C++11 modes.

gcc/testsuite/g++.dg/template/virtual1.C

+// PR c++/51029
+
+struct A
+{
+  void foo();
+};
+
+struct B : virtual A
+{
+  template<int> B()
+  {
+    foo();
+  }
+};