Mercurial > hg > icedtea8

changeset 2981:fa3b7f27ad07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump shenandoah to aarch64-shenandoah-jdk8u275-b01. Upstream changes: - JDK-8250861: Crash in MinINode::Ideal(PhaseGVN*, bool) ChangeLog: 2020-11-17 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump shenandoah to aarch64-shenandoah-jdk8u275-b01. * Makefile.am: (ICEDTEA_PATCHES): Add new patches for fixing PR3815 issues in both the core HotSpot code (same as in IcedTea) and Shenandoah code. * hotspot.map.in: Bump shenandoah to aarch64-shenandoah-jdk8u275-b01. * patches/hotspot/aarch32/8222286-pr3815-s390.patch: Add copy of PR3815 for the alternate AArch32 HotSpot build. * patches/hotspot/shenandoah/8222286-pr3727-s390-shenandoah.patch: Amend to use log2_intptr and an int cast, rather than log2_long, as with other log2_intptr fixes. * patches/hotspot/shenandoah/8222286-pr3815-s390-shenandoah.patch: Addition to PR3815 for the Shenandoah HotSpot build only. * patches/hotspot/shenandoah/8222286-pr3815-s390.patch, Add copy of PR3815 for the alternate Shenandoah HotSpot build.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 20 Nov 2020 02:06:51 +0000
parents ca7b3657b9ba
children e38ca4001c41
files ChangeLog Makefile.am hotspot.map.in patches/hotspot/aarch32/8222286-pr3815-s390.patch patches/hotspot/shenandoah/8222286-pr3727-s390-shenandoah.patch patches/hotspot/shenandoah/8222286-pr3815-s390-shenandoah.patch patches/hotspot/shenandoah/8222286-pr3815-s390.patch
diffstat 7 files changed, 56 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 15 23:52:37 2020 +0000
+++ b/ChangeLog	Fri Nov 20 02:06:51 2020 +0000
@@ -1,3 +1,22 @@
+2020-11-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump shenandoah to aarch64-shenandoah-jdk8u275-b01.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches for fixing PR3815
+	issues in both the core HotSpot code (same as in
+	IcedTea) and Shenandoah code.
+	* hotspot.map.in: Bump shenandoah to
+	aarch64-shenandoah-jdk8u275-b01.
+	* patches/hotspot/aarch32/8222286-pr3815-s390.patch:
+	Add copy of PR3815 for the alternate AArch32 HotSpot build.
+	* patches/hotspot/shenandoah/8222286-pr3727-s390-shenandoah.patch:
+	Amend to use log2_intptr and an int cast, rather than log2_long,
+	as with other log2_intptr fixes.
+	* patches/hotspot/shenandoah/8222286-pr3815-s390-shenandoah.patch:
+	Addition to PR3815 for the Shenandoah HotSpot build only.
+	* patches/hotspot/shenandoah/8222286-pr3815-s390.patch,
+	Add copy of PR3815 for the alternate Shenandoah HotSpot build.
+
 2020-11-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-3.17.1.
--- a/Makefile.am	Sun Nov 15 23:52:37 2020 +0000
+++ b/Makefile.am	Fri Nov 20 02:06:51 2020 +0000
@@ -382,7 +382,8 @@
 	patches/hotspot/$(HSBUILD)/pr3728.patch \
 	patches/hotspot/$(HSBUILD)/8222286-pr3727-s390.patch \
 	patches/hotspot/$(HSBUILD)/8152358-pr3800.patch \
-	patches/hotspot/$(HSBUILD)/pr3798.patch
+	patches/hotspot/$(HSBUILD)/pr3798.patch \
+	patches/hotspot/$(HSBUILD)/8222286-pr3815-s390.patch
 
 # Shenandoah has the AArch64 port so should get the return value & debug build fixes
 # Shenandoah also needs some fixes to build on all architectures
@@ -390,7 +391,8 @@
 ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/8158260-pr2991-rh1341258-aarch64.patch \
 	patches/hotspot/$(HSBUILD)/8222286-pr3727-s390-shenandoah.patch \
-	patches/hotspot/$(HSBUILD)/pr3519-return_value-02.patch
+	patches/hotspot/$(HSBUILD)/pr3519-return_value-02.patch \
+	patches/hotspot/$(HSBUILD)/8222286-pr3815-s390-shenandoah.patch
 endif
 endif
 
--- a/hotspot.map.in	Sun Nov 15 23:52:37 2020 +0000
+++ b/hotspot.map.in	Fri Nov 20 02:06:51 2020 +0000
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
 default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ e7fd2b284bd0 9205bc1f1dd558c726bcd3770ef4a4960c505e96a48f07d9fd1a7bf40627af22
-shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ efc167880db9 1718e537f195adba5f98e30d115cc15db530d3f91e88cdbaaf307ea4220f7cc9
+shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ bef9421300e3 e2dfc5105336d1b5dcd08641358d66a40d87be637d2f2e7491a71b8fb5161668
 aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ aed49822247b b164443492d7ccc2fcceefe422b2548e700c6ac2767e30463d8188a39c9034da
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/aarch32/8222286-pr3815-s390.patch	Fri Nov 20 02:06:51 2020 +0000
@@ -0,0 +1,1 @@
+../shenandoah/8222286-pr3815-s390.patch
\ No newline at end of file
--- a/patches/hotspot/shenandoah/8222286-pr3727-s390-shenandoah.patch	Sun Nov 15 23:52:37 2020 +0000
+++ b/patches/hotspot/shenandoah/8222286-pr3727-s390-shenandoah.patch	Fri Nov 20 02:06:51 2020 +0000
@@ -10,7 +10,7 @@
    Atomic::add(val, &_sum);
  
 -  int mag = log2_intptr(val) + 1;
-+  int mag = log2_long(val) + 1;
++  int mag = log2_intptr((uintptr_t) val) + 1;
  
    // Defensively saturate for product bits:
    if (mag < 0) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/shenandoah/8222286-pr3815-s390-shenandoah.patch	Fri Nov 20 02:06:51 2020 +0000
@@ -0,0 +1,10 @@
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp
+@@ -150,5 +150,5 @@
+     return value;
+   }
+ 
+-  return (size_t)1 << (log2_intptr(value) + 1);
++  return (size_t)1 << (log2_intptr((uintptr_t) value) + 1);
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/shenandoah/8222286-pr3815-s390.patch	Fri Nov 20 02:06:51 2020 +0000
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1605152060 0
+#      Thu Nov 12 03:34:20 2020 +0000
+# Node ID e7fd2b284bd059020c3edfa7ba8c02febe0d5a59
+# Parent  e3dc4a3d588c1d4556cc54704683a50b034b5584
+PR3815: Fix new s390 size_t issue in g1ConcurrentMarkObjArrayProcessor.cpp
+
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMarkObjArrayProcessor.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMarkObjArrayProcessor.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+@@ -41,7 +41,7 @@
+ }
+ 
+ size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
+-  size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
++  size_t words_to_scan = MIN2(remaining, (size_t) ObjArrayMarkingStride);
+ 
+   if (remaining > ObjArrayMarkingStride) {
+     push_array_slice(start_from + ObjArrayMarkingStride);