diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2020-11-07 22:02:32 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2020-11-07 22:02:32 +0000 |
| commit | 5401b1924dc562b50cc582f33f87fa95bc7345f4 (patch) | |
| tree | 8aca964f5d98542b0663939b74a379ddc866ff68 /java | |
| parent | - Include a patch from upstream to fix regression in schemas.xml (diff) | |
Fix a crash per https://bugs.openjdk.java.net/browse/JDK-8250861
This effectively upgrades us to 11.0.9.1
Notes
Notes:
svn path=/head/; revision=554419
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk11/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 1b2718d1f6c8..1d29a5a0cf9b 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -3,7 +3,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} diff --git a/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp b/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp new file mode 100644 index 000000000000..4f304ce6b1ae --- /dev/null +++ b/java/openjdk11/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))); |