blob: c9a522d2e2aa2230e877293681f4c1efdd84cd71 [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 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]
Andrew Geisslereff27472021-10-29 15:35:00 -050012
Andrew Geisslerc5535c92023-01-27 16:10:19 -060013Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
14---
15 deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++---
16 deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +-
17 deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +-
18 .../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +-
19 4 files changed, 6 insertions(+), 6 deletions(-)
20
21diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h
22index 22c7f73a..db4cb168 100644
Andrew Geisslereff27472021-10-29 15:35:00 -050023--- a/deps/v8/src/wasm/baseline/liftoff-assembler.h
24+++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h
Andrew Geisslerc5535c92023-01-27 16:10:19 -060025@@ -646,7 +646,7 @@ class LiftoffAssembler : public TurboAssembler {
Andrew Geisslereff27472021-10-29 15:35:00 -050026 void FinishCall(const ValueKindSig*, compiler::CallDescriptor*);
27
28 // Move {src} into {dst}. {src} and {dst} must be different.
29- void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind);
30+ void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind kind);
31
32 // Parallel register move: For a list of tuples <dst, src, kind>, move the
33 // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore
Andrew Geisslerc5535c92023-01-27 16:10:19 -060034@@ -795,8 +795,8 @@ class LiftoffAssembler : public TurboAssembler {
Andrew Geisslereff27472021-10-29 15:35:00 -050035 inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset,
36 ValueKind);
37
38- inline void Move(Register dst, Register src, ValueKind);
39- inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind);
40+ inline void Move(Register dst, Register src, ValueKind kind);
41+ inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind kind);
42
43 inline void Spill(int offset, LiftoffRegister, ValueKind);
44 inline void Spill(int offset, WasmValue);
Andrew Geisslerc5535c92023-01-27 16:10:19 -060045diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
46index c76fd2f4..0fffe231 100644
Andrew Geisslereff27472021-10-29 15:35:00 -050047--- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
48+++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
Andrew Geisslerc5535c92023-01-27 16:10:19 -060049@@ -661,7 +661,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
50 pinned = pinned | LiftoffRegList{dst_op.rm(), src};
Andrew Geisslereff27472021-10-29 15:35:00 -050051 LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
52 // Save original value.
53- Move(tmp, src, type.value_type());
54+ Move(tmp, src, type.value_type().kind());
55
56 src = tmp;
57 pinned.set(tmp);
Andrew Geisslerc5535c92023-01-27 16:10:19 -060058diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
59index 36413545..48207337 100644
Andrew Geisslereff27472021-10-29 15:35:00 -050060--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
61+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
Andrew Geisslerc5535c92023-01-27 16:10:19 -060062@@ -593,7 +593,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
Andrew Geisslereff27472021-10-29 15:35:00 -050063 pinned.set(dst_op.rm());
64 LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
65 // Save original value.
66- Move(tmp, src, type.value_type());
67+ Move(tmp, src, type.value_type().kind());
68
69 src = tmp;
70 pinned.set(tmp);
Andrew Geisslerc5535c92023-01-27 16:10:19 -060071diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h
72index 642a7d2a..56ffcc2a 100644
Andrew Geisslereff27472021-10-29 15:35:00 -050073--- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h
74+++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h
Andrew Geisslerc5535c92023-01-27 16:10:19 -060075@@ -589,7 +589,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
Andrew Geisslereff27472021-10-29 15:35:00 -050076 pinned.set(dst_op.rm());
77 LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
78 // Save original value.
79- Move(tmp, src, type.value_type());
80+ Move(tmp, src, type.value_type().kind());
81
82 src = tmp;
83 pinned.set(tmp);
Andrew Geisslerc5535c92023-01-27 16:10:19 -060084--
852.34.1