aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorGCC Administrator <gccadmin@gcc.gnu.org>2022-11-30 00:17:59 +0000
committerGCC Administrator <gccadmin@gcc.gnu.org>2022-11-30 00:17:59 +0000
commit9b377463856c8ca985c0a8c95de8712ffa4b5ef6 (patch)
treed0c5de534069d090b2e2e8244b33d8f983513b18 /gcc/fortran
parentb6c6a3d64f2e4e9347733290aca3c75898c44b2e (diff)
downloadgcc-9b377463856c8ca985c0a8c95de8712ffa4b5ef6.zip
gcc-9b377463856c8ca985c0a8c95de8712ffa4b5ef6.tar.gz
gcc-9b377463856c8ca985c0a8c95de8712ffa4b5ef6.tar.bz2
Daily bump.
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog10
1 files changed, 10 insertions, 0 deletions
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