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