From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 24 Dec 2015 02:10:08 +0000 (-0800)
Subject: nir/cf: Make extracting or re-inserting nothing a no-op
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1b1d58becffcc647acd1f242ceccdb9042cccf1;p=mesa.git

nir/cf: Make extracting or re-inserting nothing a no-op
---

diff --git a/src/glsl/nir/nir_control_flow.c b/src/glsl/nir/nir_control_flow.c
index ecd9cbd4173..33b06d0cc84 100644
--- a/src/glsl/nir/nir_control_flow.c
+++ b/src/glsl/nir/nir_control_flow.c
@@ -749,6 +749,12 @@ nir_cf_extract(nir_cf_list *extracted, nir_cursor begin, nir_cursor end)
 {
    nir_block *block_begin, *block_end, *block_before, *block_after;
 
+   if (nir_cursors_equal(begin, end)) {
+      exec_list_make_empty(&extracted->list);
+      extracted->impl = NULL; /* we shouldn't need this */
+      return;
+   }
+
    /* In the case where begin points to an instruction in some basic block and
     * end points to the end of the same basic block, we rely on the fact that
     * splitting on an instruction moves earlier instructions into a new basic
@@ -788,6 +794,9 @@ nir_cf_reinsert(nir_cf_list *cf_list, nir_cursor cursor)
 {
    nir_block *before, *after;
 
+   if (exec_list_is_empty(&cf_list->list))
+      return;
+
    split_block_cursor(cursor, &before, &after);
 
    foreach_list_typed_safe(nir_cf_node, node, node, &cf_list->list) {