commit 3832c6f7e672e76bba74a508bf3a49740ea38046
author Harald Anlauf <anlauf@gmx.de> Mon Nov 28 20:43:02 2022 +0100
committer Harald Anlauf <anlauf@gmx.de> Tue Nov 29 19:11:10 2022 +0100
tree d8f0e191348ffeb1dacfebf2a7a1034f8149ad5e
parent cca06f0d6d76b08ed4ddb7667eda93e2e9f2589e

Fortran: intrinsic MERGE shall use all its arguments [PR107874]

gcc/fortran/ChangeLog:

	PR fortran/107874
	* simplify.cc (gfc_simplify_merge): When simplifying MERGE with a
	constant scalar MASK, ensure that arguments TSOURCE and FSOURCE are
	either constant or will be evaluated.
	* trans-intrinsic.cc (gfc_conv_intrinsic_merge): Evaluate arguments
	before generating conditional expression.

gcc/testsuite/ChangeLog:

	PR fortran/107874
	* gfortran.dg/merge_init_expr_2.f90: Adjust code to the corrected
	simplification.
	* gfortran.dg/merge_1.f90: New test.

Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>