package/gcc: backport fix for xtensa PR 91880
PATCH 1/1 package/gcc: backport fix for xtensa PR 91880
Xtensa hwloop_optimize segfaults when zero overhead loop is about to be inserted as the first instruction of the function.
Insert zero overhead loop instruction into new basic block before the loop when basic block that precedes the loop is empty.
Signed-off-by Max Filippov <[email protected]>
--- .../7.4.0/1003-xtensa-fix-PR-target-91880.patch | 49 ++++++++++++++++++++++ .../8.3.0/0002-xtensa-fix-PR-target-91880.patch | 49 ++++++++++++++++++++++ .../9.2.0/0002-xtensa-fix-PR-target-91880.patch | 49 ++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch create mode 100644 package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch create mode 100644 package/gcc/9.2.0/0002-xtensa-fix-PR-target-91880.patch
package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 7c11710230921246156aecc20eb4b6ccaeaaa473 Mon Sep 17 00:00:00 2001 +From: Max Filippov <[email protected]> +Date: Tue, 24 Sep 2019 04:15:17 -0700 +Subject: [PATCH] xtensa: fix PR target/91880 + +Xtensa hwloop_optimize segfaults when zero overhead loop is about to be +inserted as the first instruction of the function. +Insert zero overhead loop instruction into new basic block before the +loop when basic block that precedes the loop is empty. + +2019-09-26 Max Filippov <[email protected]> +gcc/ + * config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead + loop instruction into new basic block before the loop when basic + block that precedes the loop is empty. + +Signed-off-by: Max Filippov <[email protected]> +--- +Backported from: r276166 + + gcc/config/xtensa/xtensa.c | 5 ++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index ee5612441e25..2527468d57db 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -4174,7 +4174,9 @@ hwloop_optimize (hwloop_info loop) + + seq = get_insns (); + +- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1) ++ entry_after = BB_END (entry_bb); ++ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1 ++ || !entry_after) + { + basic_block new_bb; + edge e; +@@ -4195,7 +4197,6 @@ hwloop_optimize (hwloop_info loop) + } + else + { +- entry_after = BB_END (entry_bb); + while (DEBUG_INSN_P (entry_after) + || (NOTE_P (entry_after) + && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK +-- +2.11.0 +
package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch new file +49 -0
49 lines not on this page · raw message
package/gcc/9.2.0/0002-xtensa-fix-PR-target-91880.patch new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.11.0
Thomas Petazzoni
AppliedPATCH 1/1 package/gcc: backport fix for xtensa PR 91880
Quoted 6 lines · On Thu, 26 Sep 2019 14:31:53 -0700 Max Filippov <[email protected]> wrote:
Xtensa
hwloop_optimizesegfaults when zero overhead loop is about to be inserted as the first instruction of the function.
Insert zero overhead loop instruction into new basic block before the loop when basic block that precedes the loop is empty.Signed-off-by Max Filippov <[email protected]>
Quoted 8 lines
--- .../7.4.0/1003-xtensa-fix-PR-target-91880.patch | 49 ++++++++++++++++++++++ .../8.3.0/0002-xtensa-fix-PR-target-91880.patch | 49 ++++++++++++++++++++++ .../9.2.0/0002-xtensa-fix-PR-target-91880.patch | 49 ++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch create mode 100644 package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch create mode 100644 package/gcc/9.2.0/0002-xtensa-fix-PR-target-91880.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com