From 1cf8937271f39da314621ae9fe94a4c3a4d986fe Mon Sep 17 00:00:00 2001
From: xiongzhou4 <xiongzhou4@huawei.com>
Date: Fri, 30 Dec 2022 20:33:21 +0800
Subject: [PATCH] [Sync] Sync patch from openeuler/gcc.

(cherry picked from commit 312a836cd881325790aa341a08161bb5b7bfdd2a)
---
 0088-Backport-fix-typo-causing-ICE.patch | 25 ++++++++++++++++++++++++
 gcc.spec                                 | 11 ++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 0088-Backport-fix-typo-causing-ICE.patch

diff --git a/0088-Backport-fix-typo-causing-ICE.patch b/0088-Backport-fix-typo-causing-ICE.patch
new file mode 100644
index 0000000..fea8ac7
--- /dev/null
+++ b/0088-Backport-fix-typo-causing-ICE.patch
@@ -0,0 +1,25 @@
+From d631be52d401d834261f86113b3a738014540b6c Mon Sep 17 00:00:00 2001
+From: xiongzhou4 <xiongzhou4@huawei.com>
+Date: Fri, 30 Dec 2022 20:15:11 +0800
+Subject: [PATCH] Replace *vcond with vcond as we check for NULL pointer.
+
+---
+ gcc/tree-ssa-reassoc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
+index 62e7c8dca..1ad43dba1 100644
+--- a/gcc/tree-ssa-reassoc.c
++++ b/gcc/tree-ssa-reassoc.c
+@@ -3839,7 +3839,7 @@ ovce_extract_ops (tree var, gassign **rets, bool *reti, tree *type,
+   gassign *stmt = dyn_cast <gassign *> (SSA_NAME_DEF_STMT (var));
+   if (stmt == NULL)
+     return ERROR_MARK;
+-  if (*vcond)
++  if (vcond)
+     *vcond = stmt;
+ 
+   /* ??? If we start creating more COND_EXPR, we could perform
+-- 
+2.33.0
+
diff --git a/gcc.spec b/gcc.spec
index 297187b..4ebb8e7 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -61,7 +61,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: 20
+Release: 21
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 URL: https://gcc.gnu.org
 
@@ -201,6 +201,7 @@ Patch84: 0084-MULL64-Disable-mull64-transformation-by-default.patch
 Patch85: 0085-loop-distribution-Bugfix-for-loop-distribution.patch
 Patch86: 0086-semi-relayout-Bugfix-for-struct-semi-relayout.patch
 Patch87: 0087-Backport-tree-optimization-97238-fix-typo-causing-IC.patch
+Patch88: 0088-Backport-fix-typo-causing-ICE.patch
 
 %global gcc_target_platform %{_arch}-linux-gnu
 
@@ -742,6 +743,7 @@ not stable, so plugins must be rebuilt any time GCC is updated.
 %patch85 -p1
 %patch86 -p1
 %patch87 -p1
+%patch88 -p1
 
 %build
 
@@ -2765,6 +2767,13 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Fri Dec 30 2022 Xiong Zhou <xiongzhou4@huawei.com> - 10.3.1-21
+- Type:Sync
+- ID:NA
+- SUG:NA
+- DESC:Sync patch from openeuler/gcc
+       Fix typo in tree-ssa-reassoc.c.
+
 * Fri Dec 23 2022 benniaobufeijiushiji <linda7@huawei.com> - 10.3.1-20
 - Type:Sync
 - ID:NA
-- 
Gitee