Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Fri Oct 23 10:21:20 2020 +0800
     1.2 +++ b/.hgtags	Sat Nov 07 10:05:19 2020 +0800
     1.3 @@ -1358,4 +1358,7 @@
     1.4  4689eaf1a5c9c5e284d466631420761f4bd4ecae jdk8u272-b07
     1.5  a0eb08e2db5a40956a9c2d6b7dea76a894559033 jdk8u272-b08
     1.6  176a7e5cc0609cface769e5e8a31b00700d223ba jdk8u272-b09
     1.7 +6b836efa38fef1b50ba798b6e344ab44ee995812 jdk8u272-b10
     1.8 +6b836efa38fef1b50ba798b6e344ab44ee995812 jdk8u272-ga
     1.9  4883cf858b5c9080b27d872ed0b8286331a802b4 mips-jdk8u272-b10
    1.10 +6b836efa38fef1b50ba798b6e344ab44ee995812 jdk8u275-b00

     2.1 --- a/src/share/vm/opto/addnode.cpp	Fri Oct 23 10:21:20 2020 +0800
     2.2 +++ b/src/share/vm/opto/addnode.cpp	Sat Nov 07 10:05:19 2020 +0800
     2.3 @@ -918,7 +918,7 @@
     2.4  
     2.5      // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z)
     2.6      // if x == y and the additions can't overflow.
     2.7 -    if (phase->eqv(x,y) &&
     2.8 +    if (phase->eqv(x,y) && tx != NULL &&
     2.9          !can_overflow(tx, x_off) &&
    2.10          !can_overflow(tx, y_off)) {
    2.11        return new (phase->C) MinINode(phase->transform(new (phase->C) AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2));
    2.12 @@ -926,7 +926,7 @@
    2.13    } else {
    2.14      // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1)
    2.15      // if x == y and the additions can't overflow.
    2.16 -    if (phase->eqv(x,y) &&
    2.17 +    if (phase->eqv(x,y) && tx != NULL &&
    2.18          !can_overflow(tx, x_off) &&
    2.19          !can_overflow(tx, y_off)) {
    2.20        return new (phase->C) AddINode(x,phase->intcon(MIN2(x_off,y_off)));