From: Connor Abbott Date: Tue, 27 Jun 2017 00:07:21 +0000 (-0700) Subject: nir: don't segfault when printing variables with no name X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=99ff7a9f1f08b2e3687946dec09b2c010540fa1d;p=mesa.git nir: don't segfault when printing variables with no name While normally we give variables whose name field is NULL a temporary name when called from nir_print_shader(), when we were calling from nir_print_instr() we never bothered, meaning that we just segfaulted when trying to print out instructions with such a variable. Since nir_print_instr() is meant to be called while debugging, we don't need to bother too much about giving a consistent name, but we don't want to crash in the middle of debugging. Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index 66c0669b594..f4811fe8bc1 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -257,7 +257,7 @@ static const char * get_var_name(nir_variable *var, print_state *state) { if (state->ht == NULL) - return var->name; + return var->name ? var->name : "unnamed"; assert(state->syms);