aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGExprAgg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/CodeGen/CGExprAgg.cpp')
-rw-r--r--lib/CodeGen/CGExprAgg.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index 13f5bc47d5..afe70a5dda 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -1263,19 +1263,17 @@ void CodeGenFunction::EmitAggregateCopy(llvm::Value *DestPtr,
Alignment, isVolatile);
}
-void CodeGenFunction::MaybeEmitStdInitializerListCleanup(LValue lvalue,
- const Expr *init) {
+void CodeGenFunction::MaybeEmitStdInitializerListCleanup(llvm::Value *loc,
+ const Expr *init) {
const ExprWithCleanups *cleanups = dyn_cast<ExprWithCleanups>(init);
- if (!cleanups)
- return; // Nothing interesting here.
- init = cleanups->getSubExpr();
+ if (cleanups)
+ init = cleanups->getSubExpr();
if (isa<InitListExpr>(init) &&
cast<InitListExpr>(init)->initializesStdInitializerList()) {
// We initialized this std::initializer_list with an initializer list.
// A backing array was created. Push a cleanup for it.
- EmitStdInitializerListCleanup(lvalue.getAddress(),
- cast<InitListExpr>(init));
+ EmitStdInitializerListCleanup(loc, cast<InitListExpr>(init));
}
}