diff --git a/src/wasm/baseline/arm/liftoff-assembler-arm.h b/src/wasm/baseline/arm/liftoff-assembler-arm.h index 5daaa854a1..02509a7389 100644 --- a/src/wasm/baseline/arm/liftoff-assembler-arm.h +++ b/src/wasm/baseline/arm/liftoff-assembler-arm.h @@ -25,6 +25,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() { CheckConstPool(true, false); } +void LiftoffAssembler::AbortCompilation() { FinishCode(); } + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { BAILOUT("LoadConstant"); diff --git a/src/wasm/baseline/arm64/liftoff-assembler-arm64.h b/src/wasm/baseline/arm64/liftoff-assembler-arm64.h index 19b90e4397..d1392061df 100644 --- a/src/wasm/baseline/arm64/liftoff-assembler-arm64.h +++ b/src/wasm/baseline/arm64/liftoff-assembler-arm64.h @@ -155,6 +155,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() { CheckConstPool(true, false); } +void LiftoffAssembler::AbortCompilation() { AbortedCodeGeneration(); } + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { switch (value.type()) { diff --git a/src/wasm/baseline/ia32/liftoff-assembler-ia32.h b/src/wasm/baseline/ia32/liftoff-assembler-ia32.h index 2454cf026e..c02cc466b0 100644 --- a/src/wasm/baseline/ia32/liftoff-assembler-ia32.h +++ b/src/wasm/baseline/ia32/liftoff-assembler-ia32.h @@ -144,6 +144,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() {} +void LiftoffAssembler::AbortCompilation() {} + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { switch (value.type()) { diff --git a/src/wasm/baseline/liftoff-assembler.h b/src/wasm/baseline/liftoff-assembler.h index d3f70040f1..38dbde02ba 100644 --- a/src/wasm/baseline/liftoff-assembler.h +++ b/src/wasm/baseline/liftoff-assembler.h @@ -350,6 +350,7 @@ class LiftoffAssembler : public TurboAssembler { inline uint32_t PrepareStackFrame(); inline void PatchPrepareStackFrame(uint32_t offset, uint32_t stack_slots); inline void FinishCode(); + inline void AbortCompilation(); inline void LoadConstant(LiftoffRegister, WasmValue, RelocInfo::Mode rmode = RelocInfo::NONE); diff --git a/src/wasm/baseline/liftoff-compiler.cc b/src/wasm/baseline/liftoff-compiler.cc index 9fc0db6822..2852353b7c 100644 --- a/src/wasm/baseline/liftoff-compiler.cc +++ b/src/wasm/baseline/liftoff-compiler.cc @@ -2013,7 +2013,7 @@ wasm::WasmCode* LiftoffCompilationUnit::FinishCompilation( void LiftoffCompilationUnit::AbortCompilation() { // The compilation is aborted. Put the assembler in a clean mode before // its deletion. - asm_.FinishCode(); + asm_.AbortCompilation(); } #undef __ diff --git a/src/wasm/baseline/mips/liftoff-assembler-mips.h b/src/wasm/baseline/mips/liftoff-assembler-mips.h index 1d7e1fd2b5..6657cd0c95 100644 --- a/src/wasm/baseline/mips/liftoff-assembler-mips.h +++ b/src/wasm/baseline/mips/liftoff-assembler-mips.h @@ -128,6 +128,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() {} +void LiftoffAssembler::AbortCompilation() {} + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { switch (value.type()) { diff --git a/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/src/wasm/baseline/mips64/liftoff-assembler-mips64.h index 32fb30a640..f85049d927 100644 --- a/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +++ b/src/wasm/baseline/mips64/liftoff-assembler-mips64.h @@ -118,6 +118,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() {} +void LiftoffAssembler::AbortCompilation() {} + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { switch (value.type()) { diff --git a/src/wasm/baseline/ppc/liftoff-assembler-ppc.h b/src/wasm/baseline/ppc/liftoff-assembler-ppc.h index 4e4e8093ab..824302a94b 100644 --- a/src/wasm/baseline/ppc/liftoff-assembler-ppc.h +++ b/src/wasm/baseline/ppc/liftoff-assembler-ppc.h @@ -25,6 +25,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() { EmitConstantPool(); } +void LiftoffAssembler::AbortCompilation() { FinishCode(); } + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { BAILOUT("LoadConstant"); diff --git a/src/wasm/baseline/s390/liftoff-assembler-s390.h b/src/wasm/baseline/s390/liftoff-assembler-s390.h index f7198f3d93..93502d37c8 100644 --- a/src/wasm/baseline/s390/liftoff-assembler-s390.h +++ b/src/wasm/baseline/s390/liftoff-assembler-s390.h @@ -25,6 +25,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() {} +void LiftoffAssembler::AbortCompilation() {} + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { BAILOUT("LoadConstant"); diff --git a/src/wasm/baseline/x64/liftoff-assembler-x64.h b/src/wasm/baseline/x64/liftoff-assembler-x64.h index 57baa11d50..0b92e1292c 100644 --- a/src/wasm/baseline/x64/liftoff-assembler-x64.h +++ b/src/wasm/baseline/x64/liftoff-assembler-x64.h @@ -134,6 +134,8 @@ void LiftoffAssembler::PatchPrepareStackFrame(uint32_t offset, void LiftoffAssembler::FinishCode() {} +void LiftoffAssembler::AbortCompilation() {} + void LiftoffAssembler::LoadConstant(LiftoffRegister reg, WasmValue value, RelocInfo::Mode rmode) { switch (value.type()) {