commit a40433a33ae83fa0d4797123b082dd5658acfa00
author Douglas Gregor <dgregor@apple.com> Tue Dec 07 00:41:46 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Dec 07 00:41:46 2010 +0000
tree 7949d3c554497cd1c15db7cf174b191373567bed
parent 52700c348b4cee9c328dd70d1fb74226a2942cc0

Use Sema::MaybeCreateExprWithCleanups() only after we've checked for a NULL/invalid expression

llvm-svn: 121081

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index aa2e2a5..88512af 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3037,7 +3037,7 @@
                                                       SourceLocation(),
                                                       Owned(E));
       if (!Res.isInvalid()) {
-        Res = MaybeCreateExprWithCleanups(Res.get());
+        Res = MaybeCreateExprWithCleanups(Res);
         Expr *Init = Res.takeAs<Expr>();
         Context.setBlockVarCopyInits(NewVD, Init);
       }
@@ -4805,7 +4805,7 @@
       if (Init.isInvalid())
         Var->setInvalidDecl();
       else if (Init.get()) {
-        Var->setInit(MaybeCreateExprWithCleanups(Init.takeAs<Expr>()));
+        Var->setInit(MaybeCreateExprWithCleanups(Init.get()));
 
         if (getLangOptions().CPlusPlus && !Var->isInvalidDecl() && 
             Var->hasGlobalStorage() && !Var->isStaticLocal() &&