Daily bump.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50e680d4d808d240d4042ab28cc58a69307bbb3b..97911f1bf798fa33279906128e71e21448954484 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2025-01-14  Robin Dapp  <rdapp@ventanamicro.com>
+
+       Backported from master:
+       2025-01-14  Robin Dapp  <rdapp@ventanamicro.com>
+
+       PR middle-end/118140
+       * gimple-match-exports.cc (maybe_resimplify_conditional_op): Add
+       COND_EXPR when we simplified to a scalar gimple value but still
+       have an else value.
+
 2025-01-10  Tamar Christina  <tamar.christina@arm.com>
 
        * config/aarch64/aarch64-cores.def (AARCH64_CORE): Fix cortex-x4 parts

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 0907fc0d8ad0b41eb1f69158ae8ebc2cf734af21..956862fd33ec67ca6b664c80f22dc6ad5dd3da7f 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20250114
+20250115

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f586d8198e0506c9501a19e3cb0814c48fa7fb8c..9e626b0dddb1d3ed849f0551c8d4aa81e347e989 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2025-01-14  Robin Dapp  <rdapp@ventanamicro.com>
+
+       Backported from master:
+       2025-01-14  Robin Dapp  <rdapp@ventanamicro.com>
+
+       PR middle-end/118140
+       * gcc.dg/vect/pr118140.c: New test.
+       * gcc.target/riscv/rvv/autovec/pr118140.c: New test.
+
 2025-01-11  Nathaniel Shead  <nathanieloshead@gmail.com>
 
        * g++.dg/modules/pr114630_a.C: Use -fmodules-ts instead of