call.c (implicit_conversion): Check BRACE_ENCLOSED_INITIALIZER_P before forcing instantiation.

	* call.c (implicit_conversion): Check BRACE_ENCLOSED_INITIALIZER_P
	before forcing instantiation.

From-SVN: r178786

gcc/cp/ChangeLog

+2011-09-09  Jason Merrill  <jason@redhat.com>
+
+	* call.c (implicit_conversion): Check BRACE_ENCLOSED_INITIALIZER_P
+	before forcing instantiation.
+
 2011-09-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/50324

gcc/cp/call.c

@@ -1848,8 +1848,8 @@ implicit_conversion (tree to, tree from, tree expr, bool c_cast_p,
 				|LOOKUP_NO_NARROWING));
 
       if (CLASS_TYPE_P (to)
-	  && !CLASSTYPE_NON_AGGREGATE (complete_type (to))
-	  && BRACE_ENCLOSED_INITIALIZER_P (expr))
+	  && BRACE_ENCLOSED_INITIALIZER_P (expr)
+	  && !CLASSTYPE_NON_AGGREGATE (complete_type (to)))
 	return build_aggr_conv (to, expr, flags);
 
       cand = build_user_type_conversion_1 (to, expr, convflags);