diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index dfddef2868dc..20f170978a6c 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -16284,8 +16284,7 @@ bool CodeGenerator::generateWasm(wasm::CallIndirectId callIndirectId, MOZ_ASSERT(functionEntryStackMap); if (functionEntryStackMap && - !stackMaps->add(trapInsnOffset.offset(), - functionEntryStackMap)) { + !stackMaps->add(trapInsnOffset.offset(), functionEntryStackMap)) { functionEntryStackMap->destroy(); return false; } diff --git a/js/src/wasm/WasmGC.cpp b/js/src/wasm/WasmGC.cpp index 6736d586a187..a39aa548b472 100644 --- a/js/src/wasm/WasmGC.cpp +++ b/js/src/wasm/WasmGC.cpp @@ -318,11 +318,11 @@ bool wasm::IsPlausibleStackMapKey(const uint8_t* nextPC) { void StackMaps::checkInvariants(const uint8_t* base) const { #ifdef DEBUG - // Chech that each entry points from the stackmap structure points - // to a plausible instruction. - for (auto iter = mapping_.iter(); !iter.done(); iter.next()) { - MOZ_ASSERT(IsPlausibleStackMapKey(base + iter.get().key()), - "wasm stackmap does not reference a valid insn"); - } -#endif + // Chech that each entry points from the stackmap structure points + // to a plausible instruction. + for (auto iter = mapping_.iter(); !iter.done(); iter.next()) { + MOZ_ASSERT(IsPlausibleStackMapKey(base + iter.get().key()), + "wasm stackmap does not reference a valid insn"); } +#endif +} diff --git a/js/src/wasm/WasmGC.h b/js/src/wasm/WasmGC.h index 76ea9939976a..5b2e32d4e76c 100644 --- a/js/src/wasm/WasmGC.h +++ b/js/src/wasm/WasmGC.h @@ -247,29 +247,28 @@ struct StackMap final { static_assert(sizeof(StackMap) == 12, "wasm::StackMap has unexpected size"); // A map from an offset relative to the beginning of a code block to a StackMap -using StackMapHashMap = HashMap, SystemAllocPolicy>; +using StackMapHashMap = + HashMap, SystemAllocPolicy>; class StackMaps { -private: - // Map for finding a stack map at a specific code offset. - StackMapHashMap mapping_; + private: + // Map for finding a stack map at a specific code offset. + StackMapHashMap mapping_; -public: - StackMaps() {} - ~StackMaps() { - for (auto iter = mapping_.modIter(); !iter.done(); iter.next()) { - StackMap* stackmap = iter.getMutable().value(); - stackmap->destroy(); - } - mapping_.clear(); + public: + StackMaps() {} + ~StackMaps() { + for (auto iter = mapping_.modIter(); !iter.done(); iter.next()) { + StackMap* stackmap = iter.getMutable().value(); + stackmap->destroy(); + } + mapping_.clear(); } [[nodiscard]] bool add(uint32_t codeOffset, StackMap* map) { return mapping_.put(codeOffset, map); } - void clear() { - mapping_.clear(); - } + void clear() { mapping_.clear(); } bool empty() const { return mapping_.empty(); } // Return the number of stack maps contained in this. size_t length() const { return mapping_.count(); } diff --git a/js/src/wasm/WasmStubs.cpp b/js/src/wasm/WasmStubs.cpp index 06d3274f7210..bc3959399f1b 100644 --- a/js/src/wasm/WasmStubs.cpp +++ b/js/src/wasm/WasmStubs.cpp @@ -1892,8 +1892,7 @@ static bool AddStackCheckForImportFunctionEntry(jit::MacroAssembler& masm, // In debug builds, we'll always have a stack map, even if there are no // refs to track. MOZ_ASSERT(stackMap); - if (stackMap && - !stackMaps->add(trapInsnOffset.offset(), stackMap)) { + if (stackMap && !stackMaps->add(trapInsnOffset.offset(), stackMap)) { stackMap->destroy(); return false; }