Blame SOURCES/s390-8214206_fix.patch

53c576
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp
53c576
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp
53c576
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp
53c576
@@ -150,5 +150,5 @@
53c576
     return value;
53c576
   }
53c576
 
53c576
-  return (size_t)1 << (log2_intptr(value) + 1);
53c576
+  return (size_t)1 << (log2_intptr((uintptr_t) value) + 1);
53c576
 }
53c576
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
53c576
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
53c576
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
53c576
@@ -135,7 +135,7 @@
53c576
 void BinaryMagnitudeSeq::add(size_t val) {
53c576
   Atomic::add(val, &_sum);
53c576
 
53c576
-  int mag = log2_intptr(val) + 1;
53c576
+  int mag = log2_intptr((uintptr_t)val) + 1;
53c576
 
53c576
   // Defensively saturate for product bits:
53c576
   if (mag < 0) {
53c576
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp
53c576
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp
53c576
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp
53c576
@@ -659,7 +659,7 @@
53c576
 }
53c576
 
53c576
 size_t ShenandoahHeap::soft_max_capacity() const {
53c576
-  size_t v = OrderAccess::load_acquire((volatile size_t*)&_soft_max_size);
53c576
+  size_t v = OrderAccess::load_acquire((volatile jlong*)&_soft_max_size);
53c576
   assert(min_capacity() <= v && v <= max_capacity(),
53c576
          err_msg("Should be in bounds: " SIZE_FORMAT " <= " SIZE_FORMAT " <= " SIZE_FORMAT,
53c576
                  min_capacity(), v, max_capacity()));
53c576
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp
53c576
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp
53c576
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp
53c576
@@ -155,7 +155,7 @@
53c576
 private:
53c576
            size_t _initial_size;
53c576
            size_t _minimum_size;
53c576
-  volatile size_t _soft_max_size;
53c576
+  volatile jlong  _soft_max_size;
53c576
   shenandoah_padding(0);
53c576
   volatile jlong  _used;
53c576
   volatile size_t _committed;