--- old/src/hotspot/share/gc/z/zStat.hpp	2018-03-05 15:14:37.302420286 +0100
+++ new/src/hotspot/share/gc/z/zStat.hpp	2018-03-05 15:14:37.140413344 +0100
@@ -374,19 +374,11 @@
   static size_t _ncontinue;
 
 public:
-  static void set_at_mark_start(size_t nstripes) {
-    _nstripes = nstripes;
-  }
-
+  static void set_at_mark_start(size_t nstripes);
   static void set_at_mark_end(size_t nproactiveflush,
                               size_t nterminateflush,
                               size_t ntrycomplete,
-                              size_t ncontinue) {
-    _nproactiveflush = nproactiveflush;
-    _nterminateflush = nterminateflush;
-    _ntrycomplete = ntrycomplete;
-    _ncontinue = ncontinue;
-  }
+                              size_t ncontinue);
 
   static void print();
 };
@@ -400,13 +392,8 @@
   static bool   _success;
 
 public:
-  static void set_at_select_relocation_set(size_t relocating) {
-    _relocating = relocating;
-  }
-
-  static void set_at_relocate_end(bool success) {
-    _success = success;
-  }
+  static void set_at_select_relocation_set(size_t relocating);
+  static void set_at_relocate_end(bool success);
 
   static void print();
 };
@@ -431,31 +418,14 @@
     size_t enqueued;
   } _soft, _weak, _final, _phantom;
 
-  static void set(ZCount* count, size_t encountered, size_t dropped, size_t enqueued) {
-    count->encountered = encountered;
-    count->discovered = dropped + enqueued;
-    count->dropped = dropped;
-    count->enqueued = enqueued;
-  }
-
+  static void set(ZCount* count, size_t encountered, size_t dropped, size_t enqueued);
   static void print(const char* name, const ZCount& ref);
 
 public:
-  static void set_soft(size_t encountered, size_t dropped, size_t enqueued) {
-    set(&_soft, encountered, dropped, enqueued);
-  }
-
-  static void set_weak(size_t encountered, size_t dropped, size_t enqueued) {
-    set(&_weak, encountered, dropped, enqueued);
-  }
-
-  static void set_final(size_t encountered, size_t dropped, size_t enqueued) {
-    set(&_final, encountered, dropped, enqueued);
-  }
-
-  static void set_phantom(size_t encountered, size_t dropped, size_t enqueued) {
-    set(&_phantom, encountered, dropped, enqueued);
-  }
+  static void set_soft(size_t encountered, size_t dropped, size_t enqueued);
+  static void set_weak(size_t encountered, size_t dropped, size_t enqueued);
+  static void set_final(size_t encountered, size_t dropped, size_t enqueued);
+  static void set_phantom(size_t encountered, size_t dropped, size_t enqueued);
 
   static void print();
 };
@@ -515,97 +485,34 @@
     size_t free_low;
   } _at_relocate_end;
 
-  static size_t available(size_t used) {
-    return _at_initialize.max_capacity - used;
-  }
-
-  static size_t reserve(size_t used) {
-    return MIN2(_at_initialize.max_reserve, available(used));
-  }
-
-  static size_t free(size_t used) {
-    return available(used) - reserve(used);
-  }
+  static size_t available(size_t used);
+  static size_t reserve(size_t used);
+  static size_t free(size_t used);
 
 public:
   static void set_at_initialize(size_t max_capacity,
-                                size_t max_reserve) {
-    _at_initialize.max_capacity = max_capacity;
-    _at_initialize.max_reserve = max_reserve;
-  }
-
+                                size_t max_reserve);
   static void set_at_mark_start(size_t capacity,
-                                size_t used) {
-    _at_mark_start.capacity = capacity;
-    _at_mark_start.reserve = reserve(used);
-    _at_mark_start.used = used;
-    _at_mark_start.free = free(used);
-  }
-
+                                size_t used);
   static void set_at_mark_end(size_t capacity,
                               size_t allocated,
-                              size_t used) {
-    _at_mark_end.capacity = capacity;
-    _at_mark_end.reserve = reserve(used);
-    _at_mark_end.allocated = allocated;
-    _at_mark_end.used = used;
-    _at_mark_end.free = free(used);
-  }
-
+                              size_t used);
   static void set_at_select_relocation_set(size_t live,
                                            size_t garbage,
-                                           size_t reclaimed) {
-    _at_mark_end.live = live;
-    _at_mark_end.garbage = garbage;
-
-    _at_relocate_start.garbage = garbage - reclaimed;
-    _at_relocate_start.reclaimed = reclaimed;
-  }
-
+                                           size_t reclaimed);
   static void set_at_relocate_start(size_t capacity,
                                     size_t allocated,
-                                    size_t used) {
-    _at_relocate_start.capacity = capacity;
-    _at_relocate_start.reserve = reserve(used);
-    _at_relocate_start.allocated = allocated;
-    _at_relocate_start.used = used;
-    _at_relocate_start.free = free(used);
-  }
-
+                                    size_t used);
   static void set_at_relocate_end(size_t capacity,
                                   size_t allocated,
                                   size_t reclaimed,
                                   size_t used,
                                   size_t used_high,
-                                  size_t used_low) {
-    _at_relocate_end.capacity = capacity;
-    _at_relocate_end.capacity_high = capacity;
-    _at_relocate_end.capacity_low = _at_mark_start.capacity;
-    _at_relocate_end.reserve = reserve(used);
-    _at_relocate_end.reserve_high = reserve(used_high);
-    _at_relocate_end.reserve_low = reserve(used_low);
-    _at_relocate_end.garbage = _at_mark_end.garbage - reclaimed;
-    _at_relocate_end.allocated = allocated;
-    _at_relocate_end.reclaimed = reclaimed;
-    _at_relocate_end.used = used;
-    _at_relocate_end.used_high = used_high;
-    _at_relocate_end.used_low = used_low;
-    _at_relocate_end.free = free(used);
-    _at_relocate_end.free_high = free(used_low);
-    _at_relocate_end.free_low = free(used_high);
-  }
-
-  static size_t max_capacity() {
-    return _at_initialize.max_capacity;
-  }
-
-  static size_t used_at_mark_start() {
-    return _at_mark_start.used;
-  }
-
-  static size_t used_at_relocate_end() {
-    return _at_relocate_end.used;
-  }
+                                  size_t used_low);
+
+  static size_t max_capacity();
+  static size_t used_at_mark_start();
+  static size_t used_at_relocate_end();
 
   static void print();
 };