commit 8cb63232d9c7c18a27e36edcd16ae42b2eccefee
author Richard Smith <richard-llvm@metafoo.co.uk> Tue May 28 23:09:44 2019 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue May 28 23:09:44 2019 +0000
tree 95b8021376c56b45ab9a09111c2da0c033b0d31e
parent 94ef686f575c5cd66b0b30e34aaa5dc7b05ad361

If capturing a variable fails, add a capture anyway (and mark it
invalid) so that we can avoid repeated diagnostics for the same capture.

llvm-svn: 361891

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index c7fb565..51a72c6 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -4228,6 +4228,9 @@
                              SmallVectorImpl<Expr *> &CaptureInits,
                              ArrayRef<sema::Capture> Candidates) {
   for (const sema::Capture &Cap : Candidates) {
+    if (Cap.isInvalid())
+      continue;
+
     if (Cap.isThisCapture()) {
       Captures.push_back(CapturedStmt::Capture(Cap.getLocation(),
                                                CapturedStmt::VCK_This));