gcc/ChangeLog:

2018-07-06  Kugan Vivekanandarajah  <kuganv@linaro.org>

	* gimplify.h (generic_expr_could_trap_p): Set as global function.
	* gimplify.h (generic_expr_could_trap_p): Likwise.
	* tree-scalar-evolution.c (expression_expensive_p): Handle COND_EXPR.

gcc/testsuite/ChangeLog:

2018-07-06  Kugan Vivekanandarajah  <kuganv@linaro.org>

	* gcc.dg/tree-ssa/pr64183.c: Disable final value replacement
	to preserve the test.
	* gcc.target/i386/pr85073.c: Likewise.

From-SVN: r262486