svn commit: r554420 - in head/java/openjdk13: . files
Greg Lewis
glewis at FreeBSD.org
Sat Nov 7 22:16:29 UTC 2020
Author: glewis
Date: Sat Nov 7 22:16:28 2020
New Revision: 554420
URL: https://svnweb.freebsd.org/changeset/ports/554420
Log:
Fix a crash per https://bugs.openjdk.java.net/browse/JDK-8250861
This effectively upgrades us to 13.0.5.1
Added:
head/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp (contents, props changed)
Modified:
head/java/openjdk13/Makefile
Modified: head/java/openjdk13/Makefile
==============================================================================
--- head/java/openjdk13/Makefile Sat Nov 7 22:02:32 2020 (r554419)
+++ head/java/openjdk13/Makefile Sat Nov 7 22:16:28 2020 (r554420)
@@ -3,6 +3,7 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION= 1
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
Added: head/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp Sat Nov 7 22:16:28 2020 (r554420)
@@ -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)));
More information about the svn-ports-all
mailing list