From: Francisco Jerez <currojerez@riseup.net>
Date: Fri, 11 Mar 2016 04:56:47 +0000 (-0800)
Subject: entel/compiler: Simplify new_idom reduction in dominance tree calculation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6cdf66cd6e2515471c7944f67ddb87881c2366e;p=mesa.git

entel/compiler: Simplify new_idom reduction in dominance tree calculation

Trivial, just use a few less tokens to do the same thing.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>
---

diff --git a/src/intel/compiler/brw_cfg.cpp b/src/intel/compiler/brw_cfg.cpp
index b681e098ab6..e476ea36217 100644
--- a/src/intel/compiler/brw_cfg.cpp
+++ b/src/intel/compiler/brw_cfg.cpp
@@ -554,11 +554,8 @@ idom_tree::idom_tree(const backend_shader *s) :
          bblock_t *new_idom = NULL;
          foreach_list_typed(bblock_link, parent_link, link, &block->parents) {
             if (parent(parent_link->block)) {
-               if (new_idom == NULL) {
-                  new_idom = parent_link->block;
-               } else if (parent(parent_link->block) != NULL) {
-                  new_idom = intersect(parent_link->block, new_idom);
-               }
+               new_idom = (new_idom ? intersect(new_idom, parent_link->block) :
+                           parent_link->block);
             }
          }