From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 30 Aug 2019 17:48:41 +0000 (-0700)
Subject: pan/midgard: Allow NULL argument in mir_has_arg
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72cbd2d4e77c782fa67b96ab12e2d2ed60cc7fb7;p=mesa.git

pan/midgard: Allow NULL argument in mir_has_arg

It's sometimes convenient to call this with no instruction specified. By
definition, a missing instruction cannot reference any argument, so
let's check for NULL and shortciruit to false.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h
index cc63b6ce7c7..201999359cf 100644
--- a/src/panfrost/midgard/compiler.h
+++ b/src/panfrost/midgard/compiler.h
@@ -566,6 +566,9 @@ v_mov(unsigned src, midgard_vector_alu_src mod, unsigned dest)
 static inline bool
 mir_has_arg(midgard_instruction *ins, unsigned arg)
 {
+        if (!ins)
+                return false;
+
         for (unsigned i = 0; i < ARRAY_SIZE(ins->src); ++i) {
                 if (ins->src[i] == arg)
                         return true;