From 9b377463856c8ca985c0a8c95de8712ffa4b5ef6 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Wed, 30 Nov 2022 00:17:59 +0000
Subject: Daily bump.

---
 gcc/fortran/ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gcc/fortran')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ba7c048..e3d6684 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2022-11-29  Harald Anlauf  <anlauf@gmx.de>
+	    Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	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.
+
 2022-11-28  Harald Anlauf  <anlauf@gmx.de>
 
 	PR fortran/107819
-- 
cgit v1.1