diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-12-24 18:16:21 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-12-24 18:16:21 +0000 |
| commit | 0c94c029331f56fd086024950cebd30620148e55 (patch) | |
| tree | c9860641ca3097d7435a1b82d6271506caa776c8 /lib/CodeGen/CGTemporaries.cpp | |
| parent | 400fd3d80997c401a1bbe69e5d1e94370fcf80cc (diff) | |
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
Diffstat (limited to 'lib/CodeGen/CGTemporaries.cpp')
| -rw-r--r-- | lib/CodeGen/CGTemporaries.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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"); |