From 54cfb552abc50e8167cdc46d87455a9a414d7c65 Mon Sep 17 00:00:00 2001
From: t0b3 <thomas.bettler@gmail.com>
Date: Sat, 10 Dec 2022 14:32:53 +0100
Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Closes: #6825
Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439>
(cherry picked from commit 267dd1f4d571ee606141aa66f1665aa152b4e911)
---
 .pick_status.json               | 2 +-
 src/compiler/nir/nir_opt_move.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3ca56031087..650ff219112 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -166,7 +166,7 @@
         "description": "nir/nir_opt_move: fix ALWAYS_INLINE compiler error",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f1d20ec67c3f186886b97de94f74484650f8fda1"
     },
diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c
index 81bcde5c436..9aeb9f4cf86 100644
--- a/src/compiler/nir/nir_opt_move.c
+++ b/src/compiler/nir/nir_opt_move.c
@@ -51,13 +51,13 @@
  * lower register pressure.
  */
 
-static ALWAYS_INLINE bool
+static inline bool
 src_is_ssa(nir_src *src, void *state)
 {
    return src->is_ssa;
 }
 
-static ALWAYS_INLINE bool
+static inline bool
 instr_reads_register(nir_instr *instr)
 {
    return !nir_foreach_src(instr, src_is_ssa, NULL);