Mercurial > hg > icedtea8

changeset 2861:de07741314e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3634: Update Shenandoah fix following upstream discussion 2018-11-19 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3634: Update Shenandoah fix following upstream discussion * patches/hotspot/shenandoah/pr3634.patch: Cast ShenandoahMinRegionSize/ShenandoahMaxRegionSize as necessary rather than changing their type as OpenJDK 8 doesn't have support for size_t arguments.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 21 Nov 2018 04:38:23 +0000
parents dbee7dfe6d8e
children 69190643a78f
files ChangeLog patches/hotspot/shenandoah/pr3634.patch
diffstat 2 files changed, 23 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Nov 20 02:57:12 2018 +0000
+++ b/ChangeLog	Wed Nov 21 04:38:23 2018 +0000
@@ -1,3 +1,12 @@
+2018-11-19  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3634: Update Shenandoah fix following upstream
+	discussion
+	* patches/hotspot/shenandoah/pr3634.patch:
+	Cast ShenandoahMinRegionSize/ShenandoahMaxRegionSize
+	as necessary rather than changing their type as
+	OpenJDK 8 doesn't have support for size_t arguments.
+
 2018-11-19  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-3.10.0pre01.
--- a/patches/hotspot/shenandoah/pr3634.patch	Tue Nov 20 02:57:12 2018 +0000
+++ b/patches/hotspot/shenandoah/pr3634.patch	Wed Nov 21 04:38:23 2018 +0000
@@ -1,18 +1,16 @@
 # PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16
 
-diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
-@@ -55,10 +55,10 @@
-           "Size of the Shenandoah regions. "                                \
-           "Determined automatically by default.")                           \
-                                                                             \
--  experimental(uintx, ShenandoahMinRegionSize, 256 * K,                     \
-+  experimental(size_t, ShenandoahMinRegionSize, 256 * K,                    \
-           "Minimum heap region size. ")                                     \
-                                                                             \
--  experimental(uintx, ShenandoahMaxRegionSize, 32 * M,                      \
-+  experimental(size_t, ShenandoahMaxRegionSize, 32 * M,                     \
-           "Maximum heap region size. ")                                     \
-                                                                             \
-   experimental(intx, ShenandoahHumongousThreshold, 100,                     \
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+@@ -524,8 +524,8 @@
+     region_size = max_heap_size / ShenandoahTargetNumRegions;
+ 
+     // Now make sure that we don't go over or under our limits.
+-    region_size = MAX2(ShenandoahMinRegionSize, region_size);
+-    region_size = MIN2(ShenandoahMaxRegionSize, region_size);
++    region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size);
++    region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size);
+ 
+   } else {
+     if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {