Bug 1448563 - Fix ASAN bustage in Part 2. r=me CLOSED TREE
authorTed Campbell <tcampbell@mozilla.com>
Mon, 23 Apr 2018 15:34:25 -0400
changeset 468692 188e7c6e69317448ca60db8253d2bcc009012125
parent 468691 c1752eb8f9757218b211d1bc5b0d38ee0fd29163
child 468693 fbbae23a7d87d279116150ba5a958997aa5140dd
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1448563
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1448563 - Fix ASAN bustage in Part 2. r=me CLOSED TREE LazyLink IonBuilders should use non-inclusive size. MozReview-Commit-ID: IaaH4seekY0
js/src/vm/Runtime.cpp
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -419,17 +419,17 @@ JSRuntime::addSizeOfIncludingThis(mozill
             rtSizes->scriptData += mallocSizeOf(r.front());
     }
 
     if (jitRuntime_) {
         jitRuntime_->execAlloc().addSizeOfCode(&rtSizes->code);
 
         // Sizes of the IonBuilders we are holding for lazy linking
         for (auto builder : jitRuntime_->ionLazyLinkList(this))
-            rtSizes->jitLazyLink += builder->sizeOfIncludingThis(mallocSizeOf);
+            rtSizes->jitLazyLink += builder->sizeOfExcludingThis(mallocSizeOf);
     }
 
     rtSizes->wasmRuntime += wasmInstances.lock()->sizeOfExcludingThis(mallocSizeOf);
 }
 
 static bool
 InvokeInterruptCallback(JSContext* cx)
 {