--- old/src/hotspot/share/gc/shared/collectedHeap.inline.hpp	2018-02-12 20:05:05.039766532 -0800
+++ new/src/hotspot/share/gc/shared/collectedHeap.inline.hpp	2018-02-12 20:05:04.783767518 -0800
@@ -33,6 +33,7 @@
 #include "oops/arrayOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
+#include "runtime/heapMonitoring.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/lowMemoryDetector.hpp"
@@ -154,17 +155,17 @@
       check_for_non_bad_heap_word_value(result, size));
     assert(!HAS_PENDING_EXCEPTION,
            "Unexpected exception, will result in uninitialized storage");
-    THREAD->incr_allocated_bytes(size * HeapWordSize);
+    int size_in_bytes = size * HeapWordSize;
+    THREAD->incr_allocated_bytes(size_in_bytes);
 
-    AllocTracer::send_allocation_outside_tlab(klass, result, size * HeapWordSize, THREAD);
+    AllocTracer::send_allocation_outside_tlab(klass, result, size_in_bytes, THREAD);
 
     if (UseTLAB) {
-      THREAD->tlab().handle_sample(THREAD, result, size);
+      THREAD->tlab().handle_sample(THREAD, result, size_in_bytes);
     }
     return result;
   }
 
-
   if (!gc_overhead_limit_was_exceeded) {
     // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support
     report_java_out_of_memory("Java heap space");