middle-end/95231 - revert parts of PR95171

middle-end/95231 - revert parts of PR95171

I mistook the opportunity to also "fix" the [VEC_]COND_EXPR case
for PR95171 but I was wrong in that it doesn't need the fix and
in the actual fix as well.  The following just reverts that part.

2020-05-20  Richard Biener  <rguenther@suse.de>

	PR middle-end/95231
	* tree-inline.c (remap_gimple_stmt): Revert adjusting
	COND_EXPR and VEC_COND_EXPR for a -fnon-call-exception boundary.

	* g++.dg/other/pr95231.C: New testcase.