From 033c39a660f959f55290949b88c091ded647e7f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 24 Jul 2019 20:21:27 -0400 Subject: [PATCH] ac/nir: fix incorrect Phis if callbacks use control flow inside control flow --- src/amd/common/ac_nir_to_llvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 34d9b83e85b..c2b5254aa7c 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -4276,7 +4276,6 @@ static void visit_cf_list(struct ac_nir_context *ctx, static void visit_block(struct ac_nir_context *ctx, nir_block *block) { - LLVMBasicBlockRef llvm_block = LLVMGetInsertBlock(ctx->ac.builder); nir_foreach_instr(instr, block) { switch (instr->type) { @@ -4312,7 +4311,8 @@ static void visit_block(struct ac_nir_context *ctx, nir_block *block) } } - _mesa_hash_table_insert(ctx->defs, block, llvm_block); + _mesa_hash_table_insert(ctx->defs, block, + LLVMGetInsertBlock(ctx->ac.builder)); } static void visit_if(struct ac_nir_context *ctx, nir_if *if_stmt) -- 2.30.2