Mesa (master): nir: Use a switch statement in nir_handle_add_jump

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: d011fbde5ceda9924bae389278e8a278eb2dd2cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d011fbde5ceda9924bae389278e8a278eb2dd2cf

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri May 15 15:31:50 2020 -0500

nir: Use a switch statement in nir_handle_add_jump

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5101>

---

 src/compiler/nir/nir_control_flow.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/compiler/nir/nir_control_flow.c b/src/compiler/nir/nir_control_flow.c
index 252aaf335ad..c52d091e848 100644
--- a/src/compiler/nir/nir_control_flow.c
+++ b/src/compiler/nir/nir_control_flow.c
@@ -471,21 +471,28 @@ nir_handle_add_jump(nir_block *block)
    nir_function_impl *impl = nir_cf_node_get_function(&block->cf_node);
    nir_metadata_preserve(impl, nir_metadata_none);
 
-   if (jump_instr->type == nir_jump_break ||
-       jump_instr->type == nir_jump_continue) {
+   switch (jump_instr->type) {
+   case nir_jump_return:
+      link_blocks(block, impl->end_block, NULL);
+      break;
+
+   case nir_jump_break: {
       nir_loop *loop = nearest_loop(&block->cf_node);
+      nir_cf_node *after = nir_cf_node_next(&loop->cf_node);
+      nir_block *after_block = nir_cf_node_as_block(after);
+      link_blocks(block, after_block, NULL);
+      break;
+   }
 
-      if (jump_instr->type == nir_jump_continue) {
-         nir_block *first_block = nir_loop_first_block(loop);
-         link_blocks(block, first_block, NULL);
-      } else {
-         nir_cf_node *after = nir_cf_node_next(&loop->cf_node);
-         nir_block *after_block = nir_cf_node_as_block(after);
-         link_blocks(block, after_block, NULL);
-      }
-   } else {
-      assert(jump_instr->type == nir_jump_return);
-      link_blocks(block, impl->end_block, NULL);
+   case nir_jump_continue: {
+      nir_loop *loop = nearest_loop(&block->cf_node);
+      nir_block *first_block = nir_loop_first_block(loop);
+      link_blocks(block, first_block, NULL);
+      break;
+   }
+
+   default:
+      unreachable("Invalid jump type");
    }
 }