This commit is contained in:
parent
d8b480051a
commit
5cc29e5ec4
21
JDK-8250861.patch
Normal file
21
JDK-8250861.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- openjdk/hotspot/src/share/vm/opto/addnode.cpp Fri Oct 30 08:13:31 2020 +0000
|
||||
+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Thu Aug 06 08:10:56 2020 +0200
|
||||
@@ -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)));
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 2 14:29:43 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* JDK-8250861.patch
|
||||
+ Fix regression "8250861: Crash in MinINode::Ideal(PhaseGVN*,
|
||||
bool)" introduced in October 2020 CPU
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 28 09:47:16 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -190,6 +190,8 @@ Patch14: zero-javadoc-verbose.patch
|
||||
#
|
||||
# Patch for PPC
|
||||
Patch103: ppc-zero-hotspot.patch
|
||||
#
|
||||
Patch200: JDK-8250861.patch
|
||||
|
||||
Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch
|
||||
Patch1002: icedtea-3.8.0-s390.patch
|
||||
@ -526,6 +528,8 @@ patch -p0 -i %{PATCH14}
|
||||
patch -p0 -i %{PATCH103}
|
||||
%endif
|
||||
|
||||
patch -p0 -i %{PATCH200}
|
||||
|
||||
patch -p0 -i %{PATCH2001}
|
||||
patch -p0 -i %{PATCH2002}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user