Make explicit captures which cause implicit captures work correctly.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149719 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 8e196fb..8c49c53 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -9453,7 +9453,8 @@
// Check if the variable needs to be captured; if so, try to perform
// the capture.
// FIXME: Add support for explicit captures.
-void Sema::TryCaptureVar(VarDecl *var, SourceLocation loc) {
+void Sema::TryCaptureVar(VarDecl *var, SourceLocation loc,
+ TryCaptureKind Kind) {
DeclContext *DC = CurContext;
if (var->getDeclContext() == DC) return;
if (!var->hasLocalStorage()) return;
@@ -9536,7 +9537,12 @@
}
bool byRef;
- if (CSI->ImpCaptureStyle == CapturingScopeInfo::ImpCap_None) {
+ bool isInnermostCapture = (i == e - 1);
+ if (isInnermostCapture && Kind == TryCapture_ExplicitByVal) {
+ byRef = false;
+ } else if (isInnermostCapture && Kind == TryCapture_ExplicitByRef) {
+ byRef = true;
+ } else if (CSI->ImpCaptureStyle == CapturingScopeInfo::ImpCap_None) {
// No capture-default
Diag(loc, diag::err_lambda_impcap) << var->getDeclName();
Diag(var->getLocation(), diag::note_previous_decl) << var->getDeclName();
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 3dd271b..b35ea80 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -5030,12 +5030,6 @@
Diag(Var->getLocation(), diag::note_previous_decl) << C->Id;
continue;
}
-
- if (Var->hasAttr<BlocksAttr>()) {
- Diag(C->Loc, diag::err_lambda_capture_block) << C->Id;
- Diag(Var->getLocation(), diag::note_previous_decl) << C->Id;
- continue;
- }
// C++11 [expr.prim.lambda]p8:
// An identifier or this shall not appear more than once in a
@@ -5046,13 +5040,10 @@
<< SourceRange(LSI->getCapture(Var).getLocation());
continue;
}
-
- // FIXME: If this is capture by copy, make sure that we can in fact copy
- // the variable.
- // FIXME: Unify with normal capture path, so we get all of the necessary
- // nested captures.
- LSI->AddCapture(Var, /*isBlock*/false, C->Kind == LCK_ByRef,
- /*isNested=*/false, C->Loc, 0);
+
+ TryCaptureKind Kind = C->Kind == LCK_ByRef ? TryCapture_ExplicitByRef :
+ TryCapture_ExplicitByVal;
+ TryCaptureVar(Var, C->Loc, Kind);
}
LSI->finishedExplicitCaptures();