aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGTemporaries.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2011-01-26 04:00:11 +0000
committerJohn McCall <rjmccall@apple.com>2011-01-26 04:00:11 +0000
commit150b462afc7a713edd19bcbbbb22381fe060d4f5 (patch)
treed90a44bc497a080b64d9143f25f9ef32b6c1228f /lib/CodeGen/CGTemporaries.cpp
parent83f51722ed2b8134810cb178f39e44da811de7cd (diff)
Better framework for conditional cleanups; untested as yet.
I'm separately committing this because it incidentally changes some block orderings and minor IR issues, like using a phi instead of an unnecessary alloca. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124277 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGTemporaries.cpp')
-rw-r--r--lib/CodeGen/CGTemporaries.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CGTemporaries.cpp b/lib/CodeGen/CGTemporaries.cpp
index 6dd3a2e8bd..cfbd2af990 100644
--- a/lib/CodeGen/CGTemporaries.cpp
+++ b/lib/CodeGen/CGTemporaries.cpp
@@ -60,7 +60,7 @@ void CodeGenFunction::EmitCXXTemporary(const CXXTemporary *Temporary,
// Check if temporaries need to be conditional. If so, we'll create a
// condition boolean, initialize it to 0 and
- if (ConditionalBranchLevel != 0) {
+ if (isInConditionalBranch()) {
CondPtr = CreateTempAlloca(llvm::Type::getInt1Ty(VMContext), "cond");
// Initialize it to false. This initialization takes place right after