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.

llvm-svn: 124277

1 files changed, 1 insertions, 1 deletions

diff --git a/clang/lib/CodeGen/CGTemporaries.cpp b/clang/lib/CodeGen/CGTemporaries.cpp
index 6dd3a2e8bda..cfbd2af9902 100644
--- a/clang/lib/CodeGen/CGTemporaries.cpp
+++ b/clang/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