diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-02-23 22:36:54 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-02-23 22:36:54 +0000 |
| commit | 88a3ea34080ad3087a8191fbf479543153175d59 (patch) | |
| tree | 34eaec34d3588e09f9a77abba776266f124dc823 /libdecnumber | |
| parent | 25e15aaed275cdfef34b3ee6eb3cb4b43a48d44f (diff) | |
| parent | e65055a558093bd4fc0b1b0024b7814cc187b8e8 (diff) | |
| download | gccgo.tar.gz | |
Merge from trunk revision 257954.gccgo
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gccgo@257955 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libdecnumber')
| -rw-r--r-- | libdecnumber/ChangeLog | 6 | ||||
| -rw-r--r-- | libdecnumber/decNumber.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index bc86f268a26..ab463f57eba 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,9 @@ +2018-02-19 Martin Liska <mliska@suse.cz> + + PR c/81272 + * decNumber.c (decCompareOp): Do not use bit and + for conjunction of predicates. + 2018-01-03 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/libdecnumber/decNumber.c b/libdecnumber/decNumber.c index ebfb6c5dd96..e4194211fdc 100644 --- a/libdecnumber/decNumber.c +++ b/libdecnumber/decNumber.c @@ -6029,11 +6029,11 @@ decNumber * decCompareOp(decNumber *res, const decNumber *lhs, /* If total ordering then handle differing signs 'up front' */ if (op==COMPTOTAL) { /* total ordering */ - if (decNumberIsNegative(lhs) & !decNumberIsNegative(rhs)) { + if (decNumberIsNegative(lhs) && !decNumberIsNegative(rhs)) { result=-1; break; } - if (!decNumberIsNegative(lhs) & decNumberIsNegative(rhs)) { + if (!decNumberIsNegative(lhs) && decNumberIsNegative(rhs)) { result=+1; break; } |