PR c++/81607
	* cp-gimplify.c (cp_fold): If folding exposed a branch of
	a COND_EXPR, convert it to the original type of the COND_EXPR, if
	they differ.		   

	* g++.dg/other/bitfield6.C: New test.

From-SVN: r250948