From d88b90d9aa56bf38849725421397a80d2a8657b2 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 7 Nov 2020 22:16:28 +0000 Subject: Fix a crash per https://bugs.openjdk.java.net/browse/JDK-8250861 This effectively upgrades us to 13.0.5.1 --- .../files/patch-src_hotspot_share_opto_addnode.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp (limited to 'java/openjdk13/files') diff --git a/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp b/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp new file mode 100644 index 000000000000..4f304ce6b1ae --- /dev/null +++ b/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp @@ -0,0 +1,20 @@ +--- src/hotspot/share/opto/addnode.cpp ++++ src/hotspot/share/opto/addnode.cpp +@@ -917,7 +917,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) { + + // 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 MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2)); +@@ -925,7 +925,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) { + } 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 AddINode(x,phase->intcon(MIN2(x_off,y_off))); -- cgit v1.2.3