mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-28 04:35:33 +00:00
Bug 1428453 - Baldr: use new traps for the already-reported trap (r=bbouvier)
This commit is contained in:
parent
004a93c6fa
commit
3f567b26ea
@ -8357,7 +8357,11 @@ BaseCompiler::emitWait(ValType type, uint32_t byteSize)
|
||||
default:
|
||||
MOZ_CRASH();
|
||||
}
|
||||
masm.branchTest32(Assembler::Signed, ReturnReg, ReturnReg, oldTrap(Trap::ThrowReported));
|
||||
|
||||
Label ok;
|
||||
masm.branchTest32(Assembler::NotSigned, ReturnReg, ReturnReg, &ok);
|
||||
trap(Trap::ThrowReported);
|
||||
masm.bind(&ok);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -8376,7 +8380,11 @@ BaseCompiler::emitWake()
|
||||
return true;
|
||||
|
||||
emitInstanceCall(lineOrBytecode, SigPII_, ExprType::I32, SymbolicAddress::Wake);
|
||||
masm.branchTest32(Assembler::Signed, ReturnReg, ReturnReg, oldTrap(Trap::ThrowReported));
|
||||
|
||||
Label ok;
|
||||
masm.branchTest32(Assembler::NotSigned, ReturnReg, ReturnReg, &ok);
|
||||
trap(Trap::ThrowReported);
|
||||
masm.bind(&ok);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -1731,13 +1731,13 @@ wasm::GenerateStubs(const ModuleEnvironment& env, const FuncImportVector& import
|
||||
case Trap::IntegerDivideByZero:
|
||||
case Trap::ImpreciseSimdConversion:
|
||||
case Trap::StackOverflow:
|
||||
case Trap::ThrowReported:
|
||||
break;
|
||||
// The TODO list of "old" traps to convert to new traps:
|
||||
case Trap::OutOfBounds:
|
||||
case Trap::UnalignedAccess:
|
||||
case Trap::IndirectCallToNull:
|
||||
case Trap::IndirectCallBadSig:
|
||||
case Trap::ThrowReported: {
|
||||
case Trap::IndirectCallBadSig: {
|
||||
CallableOffsets offsets;
|
||||
if (!GenerateOldTrapExit(masm, trap, &throwLabel, &offsets))
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user