Mercurial > hg > icedtea8-forest > hotspot
changeset 10821:e3dc4a3d588c
Merge jdk8u275-ga
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 10 Nov 2020 02:47:05 +0000 |
| parents | dec52e41e748 (current diff) b36870ac13f5 (diff) |
| children | e7fd2b284bd0 |
| files | .hgtags |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Oct 28 07:40:03 2020 +0000 +++ b/.hgtags Tue Nov 10 02:47:05 2020 +0000 @@ -1418,3 +1418,6 @@ 6b836efa38fef1b50ba798b6e344ab44ee995812 jdk8u272-b10 6b836efa38fef1b50ba798b6e344ab44ee995812 jdk8u272-ga 7caa24d952f7a997decdd33dcfed5261f6e0b74b icedtea-3.17.0 +6b836efa38fef1b50ba798b6e344ab44ee995812 jdk8u275-b00 +b36c3f635d937798abe5e7c5a40a868705fed15e jdk8u275-b01 +b36c3f635d937798abe5e7c5a40a868705fed15e jdk8u275-ga
--- a/src/share/vm/opto/addnode.cpp Wed Oct 28 07:40:03 2020 +0000 +++ b/src/share/vm/opto/addnode.cpp Tue Nov 10 02:47:05 2020 +0000 @@ -918,7 +918,7 @@ // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z) // if x == y and the additions can't overflow. - if (phase->eqv(x,y) && + if (phase->eqv(x,y) && tx != NULL && !can_overflow(tx, x_off) && !can_overflow(tx, y_off)) { return new (phase->C) MinINode(phase->transform(new (phase->C) AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2)); @@ -926,7 +926,7 @@ } else { // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1) // if x == y and the additions can't overflow. - if (phase->eqv(x,y) && + if (phase->eqv(x,y) && tx != NULL && !can_overflow(tx, x_off) && !can_overflow(tx, y_off)) { return new (phase->C) AddINode(x,phase->intcon(MIN2(x_off,y_off)));