commit 9ccdb1d01bf98b47205f51a024a9ea4d5dd135d0
author Eli Friedman <eli.friedman@gmail.com> Tue Jan 31 22:47:07 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Tue Jan 31 22:47:07 2012 +0000
tree b15e786fbad40682a9dd2ccb89515c7b98600c35
parent 87d32809855c0e34b07809985627ccf84d3ab3d3

Make sure we call MaybeCreateExprWithCleanups for the sub-expression of an indirect goto.

llvm-svn: 149441

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 00f71c7..6d5824a 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -1611,6 +1611,7 @@
     E = ExprRes.take();
     if (DiagnoseAssignmentResult(ConvTy, StarLoc, DestTy, ETy, E, AA_Passing))
       return StmtError();
+    E = MaybeCreateExprWithCleanups(E);
   }
 
   getCurFunction()->setHasIndirectGoto();

clang/lib/Sema/TreeTransform.h

diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 0c0bd57..d207eb6 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -5326,6 +5326,7 @@
   ExprResult Target = getDerived().TransformExpr(S->getTarget());
   if (Target.isInvalid())
     return StmtError();
+  Target = SemaRef.MaybeCreateExprWithCleanups(Target.take());
 
   if (!getDerived().AlwaysRebuild() &&
       Target.get() == S->getTarget())