* init.c (decl_constant_value): Deal with COND_EXPR specially.
	* call.c (build_conditional_expr): Revert previous patch.

	* g++.dg/expr/cond3.C: New test.

From-SVN: r70899