diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h index 875c73dfcc..4484ff9234 100644 --- a/src/arm/macro-assembler-arm.h +++ b/src/arm/macro-assembler-arm.h @@ -38,7 +38,7 @@ constexpr Register kRuntimeCallFunctionRegister = r1; constexpr Register kRuntimeCallArgCountRegister = r0; constexpr Register kRuntimeCallArgvRegister = r2; constexpr Register kWasmInstanceRegister = r3; -constexpr Register kWasmLazyCompileFuncIndexRegister = r4; +constexpr Register kWasmCompileLazyFuncIndexRegister = r4; // ---------------------------------------------------------------------------- // Static helper functions diff --git a/src/builtins/arm/builtins-arm.cc b/src/builtins/arm/builtins-arm.cc index ce4c44ef4b..770237255d 100644 --- a/src/builtins/arm/builtins-arm.cc +++ b/src/builtins/arm/builtins-arm.cc @@ -2189,8 +2189,8 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { // The function index was put in a register by the jump table trampoline. // Convert to Smi for the runtime call. - __ SmiTag(kWasmLazyCompileFuncIndexRegister, - kWasmLazyCompileFuncIndexRegister); + __ SmiTag(kWasmCompileLazyFuncIndexRegister, + kWasmCompileLazyFuncIndexRegister); { HardAbortScope hard_abort(masm); // Avoid calls to Abort. FrameAndConstantPoolScope scope(masm, StackFrame::WASM_COMPILE_LAZY); @@ -2208,7 +2208,7 @@ void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { // Pass instance and function index as explicit arguments to the runtime // function. __ push(kWasmInstanceRegister); - __ push(kWasmLazyCompileFuncIndexRegister); + __ push(kWasmCompileLazyFuncIndexRegister); // Load the correct CEntry builtin from the instance object. __ ldr(r2, FieldMemOperand(kWasmInstanceRegister, WasmInstanceObject::kCEntryStubOffset)); diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc index f60a02d7f3..6467b60822 100644 --- a/src/builtins/s390/builtins-s390.cc +++ b/src/builtins/s390/builtins-s390.cc @@ -2276,8 +2276,8 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { // The function index was put in a register by the jump table trampoline. // Convert to Smi for the runtime call. - __ SmiTag(kWasmLazyCompileFuncIndexRegister, - kWasmLazyCompileFuncIndexRegister); + __ SmiTag(kWasmCompileLazyFuncIndexRegister, + kWasmCompileLazyFuncIndexRegister); { HardAbortScope hard_abort(masm); // Avoid calls to Abort. FrameAndConstantPoolScope scope(masm, StackFrame::WASM_COMPILE_LAZY); diff --git a/src/wasm/jump-table-assembler.cc b/src/wasm/jump-table-assembler.cc index bf048f8fd3..462e3a4b5a 100644 --- a/src/wasm/jump-table-assembler.cc +++ b/src/wasm/jump-table-assembler.cc @@ -72,7 +72,7 @@ void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index, // Load function index to a register. // This generates [movw, movt] on ARMv7 and later, [ldr, constant pool marker, // constant] on ARMv6. - Move32BitImmediate(kWasmLazyCompileFuncIndexRegister, Operand(func_index)); + Move32BitImmediate(kWasmCompileLazyFuncIndexRegister, Operand(func_index)); // EmitJumpSlot emits either [b], [movw, movt, mov] (ARMv7+), or [ldr, // constant]. // In total, this is <=5 instructions on all architectures.