/hg/release/icedtea7-forest-2.6/hotspot: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 77288aadc5a7 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=77288aadc5a7
author: thartmann
date: Thu Aug 06 08:10:56 2020 +0200

	8250861, PR3812: Crash in MinINode::Ideal(PhaseGVN*, bool)
	Summary: Added missing NULL checks.
	Reviewed-by: kvn, chagedorn


changeset 4e25e809effc in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=4e25e809effc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Nov 06 06:35:54 2020 +0000

	Added tag icedtea-2.6.24 for changeset 77288aadc5a7


changeset 8520e147fd7f in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=8520e147fd7f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Nov 06 06:36:01 2020 +0000

	Added tag icedtea-2.6.25pre00 for changeset 77288aadc5a7


diffstat:

 .hgtags                       |  2 ++
 src/share/vm/opto/addnode.cpp |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r a4c6e7e7efc5 -r 8520e147fd7f .hgtags
--- a/.hgtags	Mon Nov 02 02:26:23 2020 +0000
+++ b/.hgtags	Fri Nov 06 06:36:01 2020 +0000
@@ -974,3 +974,5 @@
 debb2913070604f611eaf916cbc90f024d17ef24 jdk7u281-b00
 e692f9f04b16a59a0959521d697bccff1a744160 jdk7u281-b01
 e692f9f04b16a59a0959521d697bccff1a744160 jdk7u281-ga
+77288aadc5a79f34c2888e0b6cab9029dc0011b1 icedtea-2.6.24
+77288aadc5a79f34c2888e0b6cab9029dc0011b1 icedtea-2.6.25pre00
diff -r a4c6e7e7efc5 -r 8520e147fd7f src/share/vm/opto/addnode.cpp
--- a/src/share/vm/opto/addnode.cpp	Mon Nov 02 02:26:23 2020 +0000
+++ b/src/share/vm/opto/addnode.cpp	Fri Nov 06 06:36:01 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)));