Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 1 | From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00 2001 |
| 2 | From: t0b3 <thomas.bettler@gmail.com> |
| 3 | Date: Sat, 10 Dec 2022 14:32:53 +0100 |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 4 | Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 5 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 6 | Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> |
| 7 | Reviewed-by: Adam Jackson <ajax@redhat.com> |
| 8 | Closes: #6825 |
| 9 | Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ") |
| 10 | Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439> |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 11 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 12 | Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911] |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 13 | --- |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 14 | src/compiler/nir/nir_opt_move.c | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 16 | |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 17 | diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 18 | index 81bcde5c436..9aeb9f4cf86 100644 |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 19 | --- a/src/compiler/nir/nir_opt_move.c |
| 20 | +++ b/src/compiler/nir/nir_opt_move.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 21 | @@ -51,13 +51,13 @@ |
| 22 | * lower register pressure. |
| 23 | */ |
| 24 | |
| 25 | -static ALWAYS_INLINE bool |
| 26 | +static inline bool |
| 27 | src_is_ssa(nir_src *src, void *state) |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 28 | { |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 29 | return src->is_ssa; |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame] | 30 | } |
| 31 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 32 | -static ALWAYS_INLINE bool |
| 33 | +static inline bool |
| 34 | instr_reads_register(nir_instr *instr) |
| 35 | { |
| 36 | return !nir_foreach_src(instr, src_is_ssa, NULL); |