From: Jason Ekstrand <jason@jlekstrand.net>
Date: Fri, 24 May 2019 14:05:32 +0000 (-0500)
Subject: nir/lower_double_ops: Rework the if (progress) tree
X-Git-Tag: upstream/21.0.0~9541
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=111b0a669979cf277f31c69f501982fee004e067;p=platform%2Fupstream%2Fmesa.git

nir/lower_double_ops: Rework the if (progress) tree

Fixes: d7d35a9522 "nir/lower_doubles: Use the new NIR lowering..."
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5170>
---

diff --git a/src/compiler/nir/nir_lower_double_ops.c b/src/compiler/nir/nir_lower_double_ops.c
index bb24765..f9c93a9 100644
--- a/src/compiler/nir/nir_lower_double_ops.c
+++ b/src/compiler/nir/nir_lower_double_ops.c
@@ -753,7 +753,14 @@ nir_lower_doubles_impl(nir_function_impl *impl,
        * inlining.
        */
       nir_opt_deref_impl(impl);
-   }
+   } else if (progress) {
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
+    } else {
+#ifndef NDEBUG
+      impl->valid_metadata &= ~nir_metadata_not_properly_reset;
+#endif
+    }
 
    return progress;
 }