1From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 20 Oct 2021 12:49:58 -0700
4Subject: [PATCH] [liftoff] Correct function signatures
5
6Fixes builds on mips where clang reports an error
7../deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h:661:5: error: no matching member function for call to 'Move'
8    Move(tmp, src, type.value_type());
9    ^~~~
10
11Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3235674]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 src/wasm/baseline/liftoff-assembler.h | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17--- a/deps/v8/src/wasm/baseline/liftoff-assembler.h
18+++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h
19@@ -613,7 +613,7 @@ class LiftoffAssembler : public TurboAss
20   void FinishCall(const ValueKindSig*, compiler::CallDescriptor*);
21
22   // Move {src} into {dst}. {src} and {dst} must be different.
23-  void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind);
24+  void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind kind);
25
26   // Parallel register move: For a list of tuples <dst, src, kind>, move the
27   // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore
28@@ -759,8 +759,8 @@ class LiftoffAssembler : public TurboAss
29   inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset,
30                              ValueKind);
31
32-  inline void Move(Register dst, Register src, ValueKind);
33-  inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind);
34+  inline void Move(Register dst, Register src, ValueKind kind);
35+  inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind kind);
36
37   inline void Spill(int offset, LiftoffRegister, ValueKind);
38   inline void Spill(int offset, WasmValue);
39--- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
40+++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
41@@ -658,7 +658,7 @@ void LiftoffAssembler::Store(Register ds
42     pinned = pinned | LiftoffRegList::ForRegs(dst_op.rm(), src);
43     LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
44     // Save original value.
45-    Move(tmp, src, type.value_type());
46+    Move(tmp, src, type.value_type().kind());
47
48     src = tmp;
49     pinned.set(tmp);
50--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
51+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
52@@ -596,7 +596,7 @@ void LiftoffAssembler::Store(Register ds
53     pinned.set(dst_op.rm());
54     LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
55     // Save original value.
56-    Move(tmp, src, type.value_type());
57+    Move(tmp, src, type.value_type().kind());
58
59     src = tmp;
60     pinned.set(tmp);
61--- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h
62+++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h
63@@ -580,7 +580,7 @@ void LiftoffAssembler::Store(Register ds
64     pinned.set(dst_op.rm());
65     LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
66     // Save original value.
67-    Move(tmp, src, type.value_type());
68+    Move(tmp, src, type.value_type().kind());
69
70     src = tmp;
71     pinned.set(tmp);
72