From: Tapani Pälli <tapani.palli@intel.com>
Date: Tue, 10 Jan 2017 08:14:03 +0000 (+0200)
Subject: nir: change asserts to unreachable in nir_type_conversion_op
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f97f93865012c5b271a5d3f81d4ea6f58d07c047;p=mesa.git

nir: change asserts to unreachable in nir_type_conversion_op

this is to avoid following compilation error on Android:

   error: control may reach end of non-void function [-Werror,-Wreturn-type]

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
---

diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index a2af3909464..f501e235c5c 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -1998,7 +1998,7 @@ nir_type_conversion_op(nir_alu_type src, nir_alu_type dst)
             return nir_op_f2i;
          };
       default:
-         assert(!"Invalid conversion");
+         unreachable("Invalid conversion");
       };
    }
 
@@ -2031,9 +2031,9 @@ nir_type_conversion_op(nir_alu_type src, nir_alu_type dst)
       case nir_type_float:
          return nir_op_d2f;
       default:
-         assert(!"Invalid conversion");
+         unreachable("Invalid conversion");
       };
    default:
-      assert(!"Invalid conversion");
+      unreachable("Invalid conversion");
    };
 }