re PR c++/53816 (internal compiler error: tree check: expected field_decl, have…

re PR c++/53816 (internal compiler error: tree check: expected field_decl, have identifier_node in fixed_type_or_null, at cp/class.c:6419, with -std=c++11 option)

	PR c++/53816
	* class.c (resolves_to_fixed_type_p): Check uses_template_parms
	(current_function_decl) instead of processing_template_decl.

From-SVN: r189187

gcc/cp/ChangeLog

 2012-07-02  Jason Merrill  <jason@redhat.com>
 
+	PR c++/53816
+	* class.c (resolves_to_fixed_type_p): Check uses_template_parms
+	(current_function_decl) instead of processing_template_decl.
+
 	PR c++/53821
 	* semantics.c (maybe_add_lambda_conv_op): Don't set
 	DECL_INTERFACE_KNOWN.

gcc/cp/class.c

@@ -6521,7 +6521,10 @@ resolves_to_fixed_type_p (tree instance, int* nonnull)
   int cdtorp = 0;
   tree fixed;
 
-  if (processing_template_decl)
+  /* processing_template_decl can be false in a template if we're in
+     fold_non_dependent_expr, but we still want to suppress this check.  */
+  if (current_function_decl
+      && uses_template_parms (current_function_decl))
     {
       /* In a template we only care about the type of the result.  */
       if (nonnull)

gcc/testsuite/ChangeLog

+2012-07-02  Jason Merrill  <jason@redhat.com>
+
+	PR c++/53816
+	* g++.dg/template/ref6.C: New.
+
 2012-07-03  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/53568

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

+// PR c++/53816
+
+template <typename T>
+struct S { int v () const; };
+template <typename T>
+struct V : public S<T> {};
+struct U
+{
+  V<int> v;
+  template<typename T>
+  struct W
+  {
+    W (U const &x) { V<int> const &v = x.v; v.v(); }
+  };
+};