Skip to contentSkip to conversation

gcc-10.1: add fix for PR 96130

PATCH In review Dmitry Baryshkov 4 participants 4 messages Jul 16, 2020 – Jul 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcc-10.1: add fix for PR 96130

From: Dmitry Baryshkov <[email protected]>

Fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96130 causing ICE (SegFault) when compiling current Mesa git tree.

---
 meta/recipes-devtools/gcc/gcc-10.1.inc        |   1 +
 .../gcc/gcc-10.1/pr96130.patch                | 106 ++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch
meta/recipes-devtools/gcc/gcc-10.1.inc +1 -0
index a3de91a2c6a3..a2dd2ae252a5 100644
@@ -66,6 +66,7 @@ SRC_URI = "\
            file://0036-Enable-CET-in-cross-compiler-if-possible.patch \
            file://0037-mingw32-Enable-operation_not_supported.patch \
            file://0038-libatomic-Do-not-enforce-march-on-aarch64.patch \
+           file://pr96130.patch \
 "
 SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"
 
meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch new file +106 -0

106 lines not on this page · raw message

Signature · 1 line
2.27.0
#1 lore raw

✗ patchtest: failure for gcc-10.1: add fix for PR 96130

== Series Details ==

Series: gcc-10.1: add fix for PR 96130
Revision: 1
URL : https://patchwork.openembedded.org/series/25161/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence]
Suggested fix Sign off the added patch file (meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch)

* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]

  Suggested fix    Add Upstream-Status: <Valid status> to the header of meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw
In reply to Dmitry Baryshkov

Khem, Richard,

Quoted 5 lines · Dmitry Baryshkov

From: Dmitry Baryshkov <[email protected]>

Fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96130 causing ICE (SegFault) when compiling current Mesa git tree.

This fixes the build issue reported when trying to build mesa master branch, see:
https://github.com/ndechesne/meta-qcom/pull/174

While we aren't using mesa/master in OE core, some BSP layer might be doing that. If mesa gets released before gcc, we might hit this issue. The gcc is queued for 10.2 already. If we can't get this patch in OE core, we will host in our layer..

Quoted 136 lines
---
 meta/recipes-devtools/gcc/gcc-10.1.inc        |   1 +
 .../gcc/gcc-10.1/pr96130.patch                | 106 ++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch
meta/recipes-devtools/gcc/gcc-10.1.inc +1 -0
index a3de91a2c6a3..a2dd2ae252a5 100644
@@ -66,6 +66,7 @@ SRC_URI = "\
            file://0036-Enable-CET-in-cross-compiler-if-possible.patch \
            file://0037-mingw32-Enable-operation_not_supported.patch \
            file://0038-libatomic-Do-not-enforce-march-on-aarch64.patch \
+           file://pr96130.patch \
 "
 SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"
 
meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch new file +106 -1
new file mode 100644
index 000000000000..f0e6f85e22f9
@@ -0,0 +1,106 @@
+From 0d03c0ee5213703ec6d9ffa632fa5298d83adaaa Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <[email protected]>
+Date: Mon, 13 Jul 2020 18:25:53 +0200
+Subject: [PATCH] ipa-fnsummary: Fix ICE with switch predicates [PR96130]
+
+The following testcase ICEs since r10-3199.
+There is a switch with default label, where the controlling expression has
+range just 0..7 and there are case labels for all those 8 values, but
+nothing has yet optimized away the default.
+Since r10-3199, set_switch_stmt_execution_predicate sets the switch to
+default label's edge's predicate to a false predicate and then
+compute_bb_predicates propagates the predicates through the cfg, but false
+predicates aren't really added.  The caller of compute_bb_predicates
+in one place handles NULL bb->aux as false predicate:
+      if (fbi.info)
+       {
+         if (bb->aux)
+           bb_predicate = *(predicate *) bb->aux;
+         else
+           bb_predicate = false;
+       }
+      else
+       bb_predicate = true;
+but then in two further spots that the patch below is changing
+it assumes bb->aux must be non-NULL.  Those two spots are guarded by a
+condition that is only true if fbi.info is non-NULL, so I think the right
+fix is to treat NULL aux as false predicate in those spots too.
+
+2020-07-13  Jakub Jelinek  <[email protected]>
+
+       PR ipa/96130
+       * ipa-fnsummary.c (analyze_function_body): Treat NULL bb->aux
+       as false predicate.
+
+       * gcc.dg/torture/pr96130.c: New test.
+
+(cherry picked from commit 776e48e0931db69f158f40e5cb8e15463d879a42)
+---
+ gcc/ipa-fnsummary.c                    | 10 ++++++++--
+ gcc/testsuite/gcc.dg/torture/pr96130.c | 26 ++++++++++++++++++++++++++
+ 2 files changed, 34 insertions(+), 2 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.dg/torture/pr96130.c
+
+diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
+index 045a0ecf766..55a0b272a96 100644
+--- a/gcc/ipa-fnsummary.c
++++ b/gcc/ipa-fnsummary.c
+@@ -2766,7 +2766,10 @@ analyze_function_body (struct cgraph_node *node, bool early)
+         edge ex;
+         unsigned int j;
+         class tree_niter_desc niter_desc;
+-        bb_predicate = *(predicate *) loop->header->aux;
++        if (loop->header->aux)
++          bb_predicate = *(predicate *) loop->header->aux;
++        else
++          bb_predicate = false;
+
+         exits = get_loop_exit_edges (loop);
+         FOR_EACH_VEC_ELT (exits, j, ex)
+@@ -2799,7 +2802,10 @@ analyze_function_body (struct cgraph_node *node, bool early)
+         for (unsigned i = 0; i < loop->num_nodes; i++)
+           {
+             gimple_stmt_iterator gsi;
+-            bb_predicate = *(predicate *) body[i]->aux;
++            if (body[i]->aux)
++              bb_predicate = *(predicate *) body[i]->aux;
++            else
++              bb_predicate = false;
+             for (gsi = gsi_start_bb (body[i]); !gsi_end_p (gsi);
+                  gsi_next (&gsi))
+               {
+diff --git a/gcc/testsuite/gcc.dg/torture/pr96130.c b/gcc/testsuite/gcc.dg/torture/pr96130.c
+new file mode 100644
+index 00000000000..f722b9ad2a9
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/torture/pr96130.c
+@@ -0,0 +1,26 @@
++/* PR ipa/96130 */
++/* { dg-do compile } */
++
++struct S { unsigned j : 3; };
++int k, l, m;
++
++void
++foo (struct S x)
++{
++  while (l != 5)
++    switch (x.j)
++      {
++      case 1:
++      case 3:
++      case 4:
++      case 6:
++      case 2:
++      case 5:
++      l = m;
++      case 7:
++      case 0:
++      k = 0;
++      default:
++      break;
++      }
++}
+--
+2.18.4
+
--

2.27.0

#3 lore raw

I am fine with this fix backported to master and perhaps dunfell too.

Quoted 155 lines · Nicolas Dechesne

Khem, Richard,

Quoted 5 lines · Dmitry Baryshkov

From: Dmitry Baryshkov <[email protected]>

Fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96130 causing ICE (SegFault) when compiling current Mesa git tree.

This fixes the build issue reported when trying to build mesa master branch, see:
https://github.com/ndechesne/meta-qcom/pull/174

While we aren't using mesa/master in OE core, some BSP layer might be doing that. If mesa gets released before gcc, we might hit this issue. The gcc is queued for 10.2 already. If we can't get this patch in OE core, we will host in our layer..

Quoted 136 lines
---
 meta/recipes-devtools/gcc/gcc-10.1.inc        |   1 +
 .../gcc/gcc-10.1/pr96130.patch                | 106 ++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch
meta/recipes-devtools/gcc/gcc-10.1.inc +1 -0
index a3de91a2c6a3..a2dd2ae252a5 100644
@@ -66,6 +66,7 @@ SRC_URI = "\
            file://0036-Enable-CET-in-cross-compiler-if-possible.patch \
            file://0037-mingw32-Enable-operation_not_supported.patch \
            file://0038-libatomic-Do-not-enforce-march-on-aarch64.patch \
+           file://pr96130.patch \
 "
 SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"
 
meta/recipes-devtools/gcc/gcc-10.1/pr96130.patch new file +106 -1
new file mode 100644
index 000000000000..f0e6f85e22f9
@@ -0,0 +1,106 @@
+From 0d03c0ee5213703ec6d9ffa632fa5298d83adaaa Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <[email protected]>
+Date: Mon, 13 Jul 2020 18:25:53 +0200
+Subject: [PATCH] ipa-fnsummary: Fix ICE with switch predicates [PR96130]
+
+The following testcase ICEs since r10-3199.
+There is a switch with default label, where the controlling expression has
+range just 0..7 and there are case labels for all those 8 values, but
+nothing has yet optimized away the default.
+Since r10-3199, set_switch_stmt_execution_predicate sets the switch to
+default label's edge's predicate to a false predicate and then
+compute_bb_predicates propagates the predicates through the cfg, but false
+predicates aren't really added.  The caller of compute_bb_predicates
+in one place handles NULL bb->aux as false predicate:
+      if (fbi.info)
+       {
+         if (bb->aux)
+           bb_predicate = *(predicate *) bb->aux;
+         else
+           bb_predicate = false;
+       }
+      else
+       bb_predicate = true;
+but then in two further spots that the patch below is changing
+it assumes bb->aux must be non-NULL.  Those two spots are guarded by a
+condition that is only true if fbi.info is non-NULL, so I think the right
+fix is to treat NULL aux as false predicate in those spots too.
+
+2020-07-13  Jakub Jelinek  <[email protected]>
+
+       PR ipa/96130
+       * ipa-fnsummary.c (analyze_function_body): Treat NULL bb->aux
+       as false predicate.
+
+       * gcc.dg/torture/pr96130.c: New test.
+
+(cherry picked from commit 776e48e0931db69f158f40e5cb8e15463d879a42)
+---
+ gcc/ipa-fnsummary.c                    | 10 ++++++++--
+ gcc/testsuite/gcc.dg/torture/pr96130.c | 26 ++++++++++++++++++++++++++
+ 2 files changed, 34 insertions(+), 2 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.dg/torture/pr96130.c
+
+diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
+index 045a0ecf766..55a0b272a96 100644
+--- a/gcc/ipa-fnsummary.c
++++ b/gcc/ipa-fnsummary.c
+@@ -2766,7 +2766,10 @@ analyze_function_body (struct cgraph_node *node, bool early)
+         edge ex;
+         unsigned int j;
+         class tree_niter_desc niter_desc;
+-        bb_predicate = *(predicate *) loop->header->aux;
++        if (loop->header->aux)
++          bb_predicate = *(predicate *) loop->header->aux;
++        else
++          bb_predicate = false;
+
+         exits = get_loop_exit_edges (loop);
+         FOR_EACH_VEC_ELT (exits, j, ex)
+@@ -2799,7 +2802,10 @@ analyze_function_body (struct cgraph_node *node, bool early)
+         for (unsigned i = 0; i < loop->num_nodes; i++)
+           {
+             gimple_stmt_iterator gsi;
+-            bb_predicate = *(predicate *) body[i]->aux;
++            if (body[i]->aux)
++              bb_predicate = *(predicate *) body[i]->aux;
++            else
++              bb_predicate = false;
+             for (gsi = gsi_start_bb (body[i]); !gsi_end_p (gsi);
+                  gsi_next (&gsi))
+               {
+diff --git a/gcc/testsuite/gcc.dg/torture/pr96130.c b/gcc/testsuite/gcc.dg/torture/pr96130.c
+new file mode 100644
+index 00000000000..f722b9ad2a9
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/torture/pr96130.c
+@@ -0,0 +1,26 @@
++/* PR ipa/96130 */
++/* { dg-do compile } */
++
++struct S { unsigned j : 3; };
++int k, l, m;
++
++void
++foo (struct S x)
++{
++  while (l != 5)
++    switch (x.j)
++      {
++      case 1:
++      case 3:
++      case 4:
++      case 6:
++      case 2:
++      case 5:
++      l = m;
++      case 7:
++      case 0:
++      k = 0;
++      default:
++      break;
++      }
++}
+--
+2.18.4
+
--

2.27.0