nir/lower_double_ops: Rework the if (progress) tree
authorJason Ekstrand <jason@jlekstrand.net>
Fri, 24 May 2019 14:05:32 +0000 (09:05 -0500)
committerMarge Bot <eric+marge@anholt.net>
Fri, 22 May 2020 18:41:15 +0000 (18:41 +0000)
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>

src/compiler/nir/nir_lower_double_ops.c

index bb2476523ec8e48f5778a631c6576ab6e6725ecd..f9c93a910a5210d8e0e5bced31cdffb955b28a8a 100644 (file)
@@ -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;
 }