From 79f802f532f0c531de64e388bb70fe909e0f21d0 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 22 Sep 2006 15:43:27 +0000 Subject: [PATCH] re PR middle-end/28964 (partition_stack_vars uses unstable sort) 2006-09-22 Richard Guenther PR middle-end/28964 * cfgexpand.c (stack_var_size_cmp): Use DECL_UID to make sort of stack variables stable. From-SVN: r117146 --- gcc/ChangeLog | 6 ++++++ gcc/cfgexpand.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 190d3873bd7..87c39b13f29 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-09-22 Richard Guenther + + PR middle-end/28964 + * cfgexpand.c (stack_var_size_cmp): Use DECL_UID to make + sort of stack variables stable. + 2006-09-22 Peter Bergner PR middle-end/28690 diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 9839d098375..4cc1047fadf 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -350,11 +350,19 @@ stack_var_size_cmp (const void *a, const void *b) { HOST_WIDE_INT sa = stack_vars[*(const size_t *)a].size; HOST_WIDE_INT sb = stack_vars[*(const size_t *)b].size; + unsigned int uida = DECL_UID (stack_vars[*(const size_t *)a].decl); + unsigned int uidb = DECL_UID (stack_vars[*(const size_t *)b].decl); if (sa < sb) return -1; if (sa > sb) return 1; + /* For stack variables of the same size use the uid of the decl + to make the sort stable. */ + if (uida < uidb) + return -1; + if (uida > uidb) + return 1; return 0; }