expr.c (categorize_ctor_elements_1): Properly count sub-elements of non-constant aggregate elements.

	* expr.c (categorize_ctor_elements_1): Properly count sub-elements of
	non-constant aggregate elements.

	* gimplify.c (gimplify_init_constructor): Do not pre-evaluate if this
	is a real initialization.

From-SVN: r158219