Bug 1448563 - Part 5b: Fix issue with mem reporting IonBuilder. r=jandem

MozReview-Commit-ID: 462mR7tAWUo

js/src/jit/IonBuilder.h

@@ -1189,11 +1189,8 @@ class IonBuilder
 
   public:
 
-    // These are only valid for IonBuilders that have moved to background
+    // This is only valid for IonBuilders that have moved to background
     size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
-    size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const {
-        return mallocSizeOf(this) + sizeOfExcludingThis(mallocSizeOf);
-    }
 };
 
 class CallInfo

js/src/vm/HelperThreads.cpp

@@ -1171,11 +1171,11 @@ GlobalHelperThreadState::addSizeOfIncludingThis(JS::GlobalStats* stats,
 
     // Report IonBuilders on wait lists
     for (auto builder : ionWorklist_)
-        htStats.ionBuilder += builder->sizeOfIncludingThis(mallocSizeOf);
+        htStats.ionBuilder += builder->sizeOfExcludingThis(mallocSizeOf);
     for (auto builder : ionFinishedList_)
-        htStats.ionBuilder += builder->sizeOfIncludingThis(mallocSizeOf);
+        htStats.ionBuilder += builder->sizeOfExcludingThis(mallocSizeOf);
     for (auto builder : ionFreeList_)
-        htStats.ionBuilder += builder->sizeOfIncludingThis(mallocSizeOf);
+        htStats.ionBuilder += builder->sizeOfExcludingThis(mallocSizeOf);
 
     // Report wasm::CompileTasks on wait lists
     for (auto task : wasmWorklist_tier1_)