--- old/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	2019-02-20 10:41:17.545014244 +0100
+++ new/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	2019-02-20 10:41:17.281006180 +0100
@@ -3300,8 +3300,14 @@
         G1GCPhaseTimes* p = _g1h->g1_policy()->phase_times();
         p->add_time_secs(G1GCPhaseTimes::ObjCopy, worker_id, elapsed_sec - term_sec);
 
-        p->record_or_add_thread_work_item(G1GCPhaseTimes::ObjCopy, worker_id, pss->lab_waste(), G1GCPhaseTimes::ObjCopyLABWaste);
-        p->record_or_add_thread_work_item(G1GCPhaseTimes::ObjCopy, worker_id, pss->lab_undo_waste(), G1GCPhaseTimes::ObjCopyLABUndoWaste);
+        p->record_or_add_thread_work_item(G1GCPhaseTimes::ObjCopy,
+                                          worker_id,
+                                          pss->lab_waste_words() * HeapWordSize,
+                                          G1GCPhaseTimes::ObjCopyLABWaste);
+        p->record_or_add_thread_work_item(G1GCPhaseTimes::ObjCopy,
+                                          worker_id,
+                                          pss->lab_undo_waste_words() * HeapWordSize,
+                                          G1GCPhaseTimes::ObjCopyLABUndoWaste);
 
         p->record_time_secs(G1GCPhaseTimes::Termination, worker_id, term_sec);
         p->record_thread_work_item(G1GCPhaseTimes::Termination, worker_id, evac_term_attempts);
--- old/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp	2019-02-20 10:41:18.483042897 +0100
+++ new/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp	2019-02-20 10:41:18.222034924 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,12 +106,12 @@
   delete[] _oops_into_optional_regions;
 }
 
-size_t G1ParScanThreadState::lab_waste() const {
-  return _plab_allocator->waste() * HeapWordSize;
+size_t G1ParScanThreadState::lab_waste_words() const {
+  return _plab_allocator->waste();
 }
 
-size_t G1ParScanThreadState::lab_undo_waste() const {
-  return _plab_allocator->undo_waste() * HeapWordSize;
+size_t G1ParScanThreadState::lab_undo_waste_words() const {
+  return _plab_allocator->undo_waste();
 }
 
 #ifdef ASSERT
--- old/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp	2019-02-20 10:41:19.588076651 +0100
+++ new/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp	2019-02-20 10:41:19.326068648 +0100
@@ -127,8 +127,8 @@
   G1EvacuationRootClosures* closures() { return _closures; }
   uint worker_id() { return _worker_id; }
 
-  size_t lab_waste() const;
-  size_t lab_undo_waste() const;
+  size_t lab_waste_words() const;
+  size_t lab_undo_waste_words() const;
 
   size_t* surviving_young_words() {
     // We add one to hide entry 0 which accumulates surviving words for