commit 0c94c029331f56fd086024950cebd30620148e55
author Douglas Gregor <dgregor@apple.com> Thu Dec 24 18:16:21 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Thu Dec 24 18:16:21 2009 +0000
tree c9860641ca3097d7435a1b82d6271506caa776c8
parent 400fd3d80997c401a1bbe69e5d1e94370fcf80cc

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

diff --git a/lib/CodeGen/CGTemporaries.cpp b/lib/CodeGen/CGTemporaries.cpp
index bfce1b0..bed8439 100644
--- a/lib/CodeGen/CGTemporaries.cpp
+++ b/lib/CodeGen/CGTemporaries.cpp
@@ -18,7 +18,8 @@
 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");