From 0c94c029331f56fd086024950cebd30620148e55 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 24 Dec 2009 18:16:21 +0000 Subject: [PATCH] Fix double-destruction assertion to account for temporaries in conditionals git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@92134 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGTemporaries.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/CGTemporaries.cpp b/lib/CodeGen/CGTemporaries.cpp index bfce1b0f74..bed843966e 100644 --- a/lib/CodeGen/CGTemporaries.cpp +++ b/lib/CodeGen/CGTemporaries.cpp @@ -18,7 +18,8 @@ using namespace CodeGen; void CodeGenFunction::PushCXXTemporary(const CXXTemporary *Temporary, llvm::Value *Ptr) { assert((LiveTemporaries.empty() || - LiveTemporaries.back().ThisPtr != Ptr) && + LiveTemporaries.back().ThisPtr != Ptr || + ConditionalBranchLevel) && "Pushed the same temporary twice; AST is likely wrong"); llvm::BasicBlock *DtorBlock = createBasicBlock("temp.dtor"); -- 2.50.1