From 5300b32c2ec3d12cd8b64d89fe195abefc79beaa Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Wed, 14 Aug 2019 18:54:27 +0000 Subject: [PATCH] Bug 1573817: Remove unused seenBytes parameters from misc wasm memory accounting methods; r=luke Differential Revision: https://phabricator.services.mozilla.com/D41959 --HG-- extra : moz-landing-system : lando --- js/src/vm/MemoryMetrics.cpp | 8 +++----- js/src/wasm/WasmDebug.cpp | 4 +--- js/src/wasm/WasmDebug.h | 1 - js/src/wasm/WasmInstance.cpp | 5 ++--- js/src/wasm/WasmInstance.h | 1 - js/src/wasm/WasmModule.cpp | 1 - js/src/wasm/WasmModule.h | 1 - 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/js/src/vm/MemoryMetrics.cpp b/js/src/vm/MemoryMetrics.cpp index 0df2f9cb6feb..53a8ab1ecc04 100644 --- a/js/src/vm/MemoryMetrics.cpp +++ b/js/src/vm/MemoryMetrics.cpp @@ -183,7 +183,6 @@ struct StatsClosure { ObjectPrivateVisitor* opv; SourceSet seenSources; wasm::Metadata::SeenSet wasmSeenMetadata; - wasm::ShareableBytes::SeenSet wasmSeenBytes; wasm::Code::SeenSet wasmSeenCode; wasm::Table::SeenSet wasmSeenTables; bool anonymize; @@ -355,7 +354,7 @@ static void StatsCellCallback(JSRuntime* rt, void* data, void* thing, CollectScriptSourceStats(closure, ss); } module.addSizeOfMisc(rtStats->mallocSizeOf_, &closure->wasmSeenMetadata, - &closure->wasmSeenBytes, &closure->wasmSeenCode, + &closure->wasmSeenCode, &info.objectsNonHeapCodeWasm, &info.objectsMallocHeapMisc); } else if (obj->is()) { @@ -365,9 +364,8 @@ static void StatsCellCallback(JSRuntime* rt, void* data, void* thing, } instance.addSizeOfMisc( rtStats->mallocSizeOf_, &closure->wasmSeenMetadata, - &closure->wasmSeenBytes, &closure->wasmSeenCode, - &closure->wasmSeenTables, &info.objectsNonHeapCodeWasm, - &info.objectsMallocHeapMisc); + &closure->wasmSeenCode, &closure->wasmSeenTables, + &info.objectsNonHeapCodeWasm, &info.objectsMallocHeapMisc); } realmStats.classInfo.add(info); diff --git a/js/src/wasm/WasmDebug.cpp b/js/src/wasm/WasmDebug.cpp index af961721f0da..8e1fab52d269 100644 --- a/js/src/wasm/WasmDebug.cpp +++ b/js/src/wasm/WasmDebug.cpp @@ -455,11 +455,9 @@ bool DebugState::getSourceMappingURL(JSContext* cx, void DebugState::addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata, - ShareableBytes::SeenSet* seenBytes, Code::SeenSet* seenCode, size_t* code, size_t* data) const { code_->addSizeOfMiscIfNotSeen(mallocSizeOf, seenMetadata, seenCode, code, data); - module_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenBytes, seenCode, code, - data); + module_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenCode, code, data); } diff --git a/js/src/wasm/WasmDebug.h b/js/src/wasm/WasmDebug.h index 436ab1a8ac72..c7e8be963f9b 100644 --- a/js/src/wasm/WasmDebug.h +++ b/js/src/wasm/WasmDebug.h @@ -137,7 +137,6 @@ class DebugState { // about:memory reporting: void addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata, - ShareableBytes::SeenSet* seenBytes, Code::SeenSet* seenCode, size_t* code, size_t* data) const; }; diff --git a/js/src/wasm/WasmInstance.cpp b/js/src/wasm/WasmInstance.cpp index dc87b450d342..8e7512f24bcf 100644 --- a/js/src/wasm/WasmInstance.cpp +++ b/js/src/wasm/WasmInstance.cpp @@ -2003,7 +2003,6 @@ void Instance::destroyBreakpointSite(JSFreeOp* fop, uint32_t offset) { void Instance::addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata, - ShareableBytes::SeenSet* seenBytes, Code::SeenSet* seenCode, Table::SeenSet* seenTables, size_t* code, size_t* data) const { @@ -2014,8 +2013,8 @@ void Instance::addSizeOfMisc(MallocSizeOf mallocSizeOf, } if (maybeDebug_) { - maybeDebug_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenBytes, seenCode, - code, data); + maybeDebug_->addSizeOfMisc(mallocSizeOf, seenMetadata, seenCode, code, + data); } code_->addSizeOfMiscIfNotSeen(mallocSizeOf, seenMetadata, seenCode, code, diff --git a/js/src/wasm/WasmInstance.h b/js/src/wasm/WasmInstance.h index ff6b57734332..df6d8b93343d 100644 --- a/js/src/wasm/WasmInstance.h +++ b/js/src/wasm/WasmInstance.h @@ -174,7 +174,6 @@ class Instance { // about:memory reporting: void addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata, - ShareableBytes::SeenSet* seenBytes, Code::SeenSet* seenCode, Table::SeenSet* seenTables, size_t* code, size_t* data) const; diff --git a/js/src/wasm/WasmModule.cpp b/js/src/wasm/WasmModule.cpp index 7912fbbcfff2..e4af7897e7ab 100644 --- a/js/src/wasm/WasmModule.cpp +++ b/js/src/wasm/WasmModule.cpp @@ -415,7 +415,6 @@ RefPtr wasm::DeserializeModule(const uint8_t* bytecode, /* virtual */ void Module::addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata, - ShareableBytes::SeenSet* seenBytes, Code::SeenSet* seenCode, size_t* code, size_t* data) const { code_->addSizeOfMiscIfNotSeen(mallocSizeOf, seenMetadata, seenCode, code, diff --git a/js/src/wasm/WasmModule.h b/js/src/wasm/WasmModule.h index 765c319ffbf5..a1907d18eabf 100644 --- a/js/src/wasm/WasmModule.h +++ b/js/src/wasm/WasmModule.h @@ -214,7 +214,6 @@ class Module : public JS::WasmModule { // about:memory reporting: void addSizeOfMisc(MallocSizeOf mallocSizeOf, Metadata::SeenSet* seenMetadata, - ShareableBytes::SeenSet* seenBytes, Code::SeenSet* seenCode, size_t* code, size_t* data) const; // GC malloc memory tracking: