diff options
| author | Alan Modra <amodra@gmail.com> | 2019-01-12 05:14:00 +1030 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2019-01-11 11:44:00 -0700 |
| commit | 0f64d96d93ce2fb7b7e5cd174c17e903f66c4a1e (patch) | |
| tree | 1f70bad1a25fd45d5d5f1e97b7ac0d87c17be5b9 | |
| parent | e173500e5360e2cf27b737660a1bb9918bfc9276 (diff) | |
| download | gcc-0f64d96d93ce2fb7b7e5cd174c17e903f66c4a1e.zip gcc-0f64d96d93ce2fb7b7e5cd174c17e903f66c4a1e.tar.gz gcc-0f64d96d93ce2fb7b7e5cd174c17e903f66c4a1e.tar.bz2 | |
re PR target/88777 (Out-of-range offsets building glibc test-tgmath2.c for hppa-linux-gnu)
PR 88777
PR 88614
* genattrtab.c (min_fn): Don't translate values.
(min_attr_value): Return INT_MAX when the value can't be calculated.
Return minimum among any values that can be calculated.
(max_attr_value): Adjust.
From-SVN: r267851
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/genattrtab.c | 42 |
2 files changed, 29 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 975eb9b..cab2430 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2019-01-11 Alan Modra <amodra@gmail.com> + + PR 88777 + PR 88614 + * genattrtab.c (min_fn): Don't translate values. + (min_attr_value): Return INT_MAX when the value can't be calculated. + Return minimum among any values that can be calculated. + (max_attr_value): Adjust. + 2019-01-11 Jakub Jelinek <jakub@redhat.com> * Makefile.in (PLUGIN_HEADERS): Add $(INSN_ATTR_H). diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c index 1dd4f14..78816ba 100644 --- a/gcc/genattrtab.c +++ b/gcc/genattrtab.c @@ -1556,10 +1556,7 @@ max_fn (rtx exp) static rtx min_fn (rtx exp) { - int val = min_attr_value (exp); - if (val < 0) - val = INT_MAX; - return make_numeric_value (val); + return make_numeric_value (min_attr_value (exp)); } static void @@ -3786,11 +3783,10 @@ max_attr_value (rtx exp) current_max = max_attr_value (XEXP (exp, 0)); if (current_max != INT_MAX) { - n = min_attr_value (XEXP (exp, 1)); - if (n == INT_MIN) - current_max = INT_MAX; - else - current_max -= n; + n = current_max; + current_max = min_attr_value (XEXP (exp, 1)); + if (current_max != INT_MAX) + current_max = n - current_max; } break; @@ -3831,8 +3827,11 @@ max_attr_value (rtx exp) } /* Given an attribute value expression, return the minimum value that - might be evaluated. Return INT_MIN if the value can't be - calculated by this function. */ + might be evaluated. Return INT_MAX if the value can't be + calculated by this function. Note that when this function can + calculate one value inside IF_THEN_ELSE or some but not all values + inside COND, then it returns the minimum among those values it can + calculate. */ static int min_attr_value (rtx exp) @@ -3852,34 +3851,33 @@ min_attr_value (rtx exp) case PLUS: current_min = min_attr_value (XEXP (exp, 0)); - if (current_min != INT_MIN) + if (current_min != INT_MAX) { n = current_min; current_min = min_attr_value (XEXP (exp, 1)); - if (current_min != INT_MIN) + if (current_min != INT_MAX) current_min += n; } break; case MINUS: current_min = min_attr_value (XEXP (exp, 0)); - if (current_min != INT_MIN) + if (current_min != INT_MAX) { - n = max_attr_value (XEXP (exp, 1)); - if (n == INT_MAX) - current_min = INT_MIN; - else - current_min -= n; + n = current_min; + current_min = max_attr_value (XEXP (exp, 1)); + if (current_min != INT_MAX) + current_min = n - current_min; } break; case MULT: current_min = min_attr_value (XEXP (exp, 0)); - if (current_min != INT_MIN) + if (current_min != INT_MAX) { n = current_min; current_min = min_attr_value (XEXP (exp, 1)); - if (current_min != INT_MIN) + if (current_min != INT_MAX) current_min *= n; } break; @@ -3902,7 +3900,7 @@ min_attr_value (rtx exp) break; default: - current_min = INT_MIN; + current_min = INT_MAX; break; } |