diff options
| author | J"orn Rennecke <joern.rennecke@st.com> | 2005-09-02 12:04:22 +0000 |
|---|---|---|
| committer | Joern Rennecke <amylaar@gcc.gnu.org> | 2005-09-02 13:04:22 +0100 |
| commit | f805670fc351f0dde9def27103567ad51125b4c8 (patch) | |
| tree | 28215a4a9220adc682a7d9f82588dce4b996c5dd /gcc | |
| parent | b8c4f9a4ce7eafd29a90298d51cd50294fe8d8a7 (diff) | |
| download | gcc-f805670fc351f0dde9def27103567ad51125b4c8.zip gcc-f805670fc351f0dde9def27103567ad51125b4c8.tar.gz gcc-f805670fc351f0dde9def27103567ad51125b4c8.tar.bz2 | |
re PR rtl-optimization/20365 (simplify_plus_minus results are erratic)
PR rtl-optimization/20365
* simplify-rtx.c (simplify_plus_minus_op_data): Change type of neg
to short. New member ix.
(simplify_plus_minus_op_data_cmp): Break ties using ix member.
(simplify_plus_minus): Initialize ix members before calling qsort.
From-SVN: r103771
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/simplify-rtx.c | 18 |
2 files changed, 22 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 44b66fb..f240c5d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2005-09-02 J"orn Rennecke <joern.rennecke@st.com> + + PR rtl-optimization/20365 + * simplify-rtx.c (simplify_plus_minus_op_data): Change type of neg + to short. New member ix. + (simplify_plus_minus_op_data_cmp): Break ties using ix member. + (simplify_plus_minus): Initialize ix members before calling qsort. + 2005-09-02 Zdenek Dvorak <dvorakz@suse.cz> PR tree-optimization/23626 diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index 8a2faae..13e90e9 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -2574,7 +2574,8 @@ simplify_const_binary_operation (enum rtx_code code, enum machine_mode mode, struct simplify_plus_minus_op_data { rtx op; - int neg; + short neg; + short ix; }; static int @@ -2582,9 +2583,13 @@ simplify_plus_minus_op_data_cmp (const void *p1, const void *p2) { const struct simplify_plus_minus_op_data *d1 = p1; const struct simplify_plus_minus_op_data *d2 = p2; + int result; - return (commutative_operand_precedence (d2->op) - - commutative_operand_precedence (d1->op)); + result = (commutative_operand_precedence (d2->op) + - commutative_operand_precedence (d1->op)); + if (result) + return result; + return d1->ix - d2->ix; } static rtx @@ -2759,7 +2764,12 @@ simplify_plus_minus (enum rtx_code code, enum machine_mode mode, rtx op0, /* Pack all the operands to the lower-numbered entries. */ for (i = 0, j = 0; j < n_ops; j++) if (ops[j].op) - ops[i++] = ops[j]; + { + ops[i] = ops[j]; + /* Stabilize sort. */ + ops[i].ix = i; + i++; + } n_ops = i; /* Sort the operations based on swap_commutative_operands_p. */ |