nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1811559 - wasm: Handle offset in EmitPreBarrierCall. r=jseward

Browse source 
EmitPreWriteBarrierCall had an offset parameter added but didn't use
it.

Differential Revision: https://phabricator.services.mozilla.com/D167418
This commit is contained in:
Ryan Hunt 2023-01-23 21:09:03 +00:00
parent fb1dc455fa
commit f27ab35b13
1 changed files with 14 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
js/src/wasm/WasmGC.cpp
View file

@ -222,7 +222,11 @@ void wasm::EmitWasmPreBarrierCall(MacroAssembler& masm, Register instance,
size_t valueOffset) {
MOZ_ASSERT(valueAddr == PreBarrierReg);
masm.loadPtr(Address(instance, Instance::offsetOfPreBarrierCode()), scratch);
// Add the offset to the PreBarrierReg, if any.
if (valueOffset != 0) {
masm.addPtr(Imm32(valueOffset), valueAddr);
}
#if defined(DEBUG) && defined(JS_CODEGEN_ARM64)
// The prebarrier assumes that x28 == sp.
Label ok;
@ -231,7 +235,16 @@ void wasm::EmitWasmPreBarrierCall(MacroAssembler& masm, Register instance,
masm.breakpoint();
masm.bind(&ok);
#endif
// Load and call the pre-write barrier code. It will preserve all volatile
// registers.
masm.loadPtr(Address(instance, Instance::offsetOfPreBarrierCode()), scratch);
masm.call(scratch);
// Remove the offset we folded into PreBarrierReg, if any.
if (valueOffset != 0) {
masm.subPtr(Imm32(valueOffset), valueAddr);
}
}
void wasm::EmitWasmPostBarrierGuard(MacroAssembler& masm,