Hold a stack of temporaries so that we can redeclare them

for all defined functions. Fixes crashes in function calls.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/mesa/pipe/llvm/llvmtgsi.cpp b/src/mesa/pipe/llvm/llvmtgsi.cpp
index cfeb19e4ba..af602326ae 100644
--- a/src/mesa/pipe/llvm/llvmtgsi.cpp
+++ b/src/mesa/pipe/llvm/llvmtgsi.cpp
@@ -508,19 +508,21 @@ translate_instruction(llvm::Module *module,
    case TGSI_OPCODE_BGNSUB: {
       instr->bgnSub(instno, storage);
       storage->setCurrentBlock(instr->currentBlock());
+      storage->pushTemps();
       return;
    }
       break;
    case TGSI_OPCODE_ENDLOOP2: {
       instr->endLoop();
       storage->setCurrentBlock(instr->currentBlock());
-      storage->popArguments();
       return;
    }
       break;
    case TGSI_OPCODE_ENDSUB: {
       instr->endSub();
       storage->setCurrentBlock(instr->currentBlock());
+      storage->popArguments();
+      storage->popTemps();
       return;
    }
       break;