- Add gcc7-pr94148.patch to fix corruption of pass private ->aux

via DF.  [gcc#94148]

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=185
This commit is contained in:
Richard Biener 2020-03-16 07:24:22 +00:00 committed by Git OBS Bridge
parent 274a8b93ea
commit 4ae7e0a5e1
48 changed files with 326 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -134,6 +134,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -288,6 +289,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -134,6 +134,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -288,6 +289,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -134,6 +134,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -288,6 +289,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -133,6 +133,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -287,6 +288,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -314,6 +314,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -1078,6 +1079,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

140
gcc7-pr94148.patch Normal file
View File

@ -0,0 +1,140 @@
commit 5c7e6d4bdf879b437b43037e10453275acabf521
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date: Thu Mar 12 07:12:50 2020 +0000
df: Don't abuse bb->aux (PR94148, PR94042)
The df dataflow solvers use the aux field in the basic_block struct,
although that is reserved for any use by passes. And not only that,
it is required that you set all such fields to NULL before calling
the solvers, or you quietly get wrong results.
This changes the solvers to use a local array for last_change_age
instead, just like it already had a local array for last_visit_age.
PR rtl-optimization/94148
PR rtl-optimization/94042
* df-core.c (BB_LAST_CHANGE_AGE): Delete.
(df_worklist_propagate_forward): New parameter last_change_age, use
that instead of bb->aux.
(df_worklist_propagate_backward): Ditto.
(df_worklist_dataflow_doublequeue): Use a local array last_change_age.
diff --git a/gcc/df-core.c b/gcc/df-core.c
index 346849e31be..9875a26895c 100644
--- a/gcc/df-core.c
+++ b/gcc/df-core.c
@@ -871,9 +871,6 @@ make_pass_df_finish (gcc::context *ctxt)
The general data flow analysis engine.
----------------------------------------------------------------------------*/
-/* Return time BB when it was visited for last time. */
-#define BB_LAST_CHANGE_AGE(bb) ((ptrdiff_t)(bb)->aux)
-
/* Helper function for df_worklist_dataflow.
Propagate the dataflow forward.
Given a BB_INDEX, do the dataflow propagation
@@ -897,7 +894,8 @@ df_worklist_propagate_forward (struct dataflow *dataflow,
unsigned *bbindex_to_postorder,
bitmap pending,
sbitmap considered,
- ptrdiff_t age)
+ vec<int> &last_change_age,
+ int age)
{
edge e;
edge_iterator ei;
@@ -908,7 +906,8 @@ df_worklist_propagate_forward (struct dataflow *dataflow,
if (EDGE_COUNT (bb->preds) > 0)
FOR_EACH_EDGE (e, ei, bb->preds)
{
- if (age <= BB_LAST_CHANGE_AGE (e->src)
+ if (bbindex_to_postorder[e->src->index] < last_change_age.length ()
+ && age <= last_change_age[bbindex_to_postorder[e->src->index]]
&& bitmap_bit_p (considered, e->src->index))
changed |= dataflow->problem->con_fun_n (e);
}
@@ -942,7 +941,8 @@ df_worklist_propagate_backward (struct dataflow *dataflow,
unsigned *bbindex_to_postorder,
bitmap pending,
sbitmap considered,
- ptrdiff_t age)
+ vec<int> &last_change_age,
+ int age)
{
edge e;
edge_iterator ei;
@@ -953,7 +953,8 @@ df_worklist_propagate_backward (struct dataflow *dataflow,
if (EDGE_COUNT (bb->succs) > 0)
FOR_EACH_EDGE (e, ei, bb->succs)
{
- if (age <= BB_LAST_CHANGE_AGE (e->dest)
+ if (bbindex_to_postorder[e->dest->index] < last_change_age.length ()
+ && age <= last_change_age[bbindex_to_postorder[e->dest->index]]
&& bitmap_bit_p (considered, e->dest->index))
changed |= dataflow->problem->con_fun_n (e);
}
@@ -991,10 +992,10 @@ df_worklist_propagate_backward (struct dataflow *dataflow,
worklists (we are processing WORKLIST and storing new BBs to visit in
PENDING).
- As an optimization we maintain ages when BB was changed (stored in bb->aux)
- and when it was last visited (stored in last_visit_age). This avoids need
- to re-do confluence function for edges to basic blocks whose source
- did not change since destination was visited last time. */
+ As an optimization we maintain ages when BB was changed (stored in
+ last_change_age) and when it was last visited (stored in last_visit_age).
+ This avoids need to re-do confluence function for edges to basic blocks
+ whose source did not change since destination was visited last time. */
static void
df_worklist_dataflow_doublequeue (struct dataflow *dataflow,
@@ -1010,11 +1011,11 @@ df_worklist_dataflow_doublequeue (struct dataflow *dataflow,
int age = 0;
bool changed;
vec<int> last_visit_age = vNULL;
+ vec<int> last_change_age = vNULL;
int prev_age;
- basic_block bb;
- int i;
last_visit_age.safe_grow_cleared (n_blocks);
+ last_change_age.safe_grow_cleared (n_blocks);
/* Double-queueing. Worklist is for the current iteration,
and pending is for the next. */
@@ -1032,30 +1033,30 @@ df_worklist_dataflow_doublequeue (struct dataflow *dataflow,
bitmap_clear_bit (pending, index);
bb_index = blocks_in_postorder[index];
- bb = BASIC_BLOCK_FOR_FN (cfun, bb_index);
prev_age = last_visit_age[index];
if (dir == DF_FORWARD)
changed = df_worklist_propagate_forward (dataflow, bb_index,
bbindex_to_postorder,
pending, considered,
+ last_change_age,
prev_age);
else
changed = df_worklist_propagate_backward (dataflow, bb_index,
bbindex_to_postorder,
pending, considered,
+ last_change_age,
prev_age);
last_visit_age[index] = ++age;
if (changed)
- bb->aux = (void *)(ptrdiff_t)age;
+ last_change_age[index] = age;
}
bitmap_clear (worklist);
}
- for (i = 0; i < n_blocks; i++)
- BASIC_BLOCK_FOR_FN (cfun, blocks_in_postorder[i])->aux = NULL;
BITMAP_FREE (worklist);
BITMAP_FREE (pending);
last_visit_age.release ();
+ last_change_age.release ();
/* Dump statistics. */
if (dump_file)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -326,6 +326,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -464,6 +465,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 07:20:32 UTC 2020 - Richard Biener <rguenther@suse.com>
- Add gcc7-pr94148.patch to fix corruption of pass private ->aux
via DF. [gcc#94148]
-------------------------------------------------------------------
Wed Mar 4 12:58:17 UTC 2020 - Richard Biener <rguenther@suse.com>

View File

@ -308,6 +308,7 @@ Patch23: gcc7-pr92692.patch
Patch24: gcc48-bsc1161913.patch
Patch25: gcc7-pr93965.patch
Patch26: gcc7-pr93888.patch
Patch27: gcc7-pr94148.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@ -1768,6 +1769,7 @@ ln -s nvptx-newlib/newlib .
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch51
%patch60
%patch61