2 files changed, 12 insertions, 0 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index d993d345ef..d3fe6b8c48 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -2956,6 +2956,8 @@ public:
 
   bool capturesCXXThis() const { return CapturesCXXThis; }
 
+  bool capturesVariable(const VarDecl *var) const;
+
   void setCaptures(ASTContext &Context,
                    const Capture *begin,
                    const Capture *end,
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 12357c07a7..8661e7405f 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -2376,6 +2376,16 @@ void BlockDecl::setCaptures(ASTContext &Context,
   Captures = static_cast<Capture*>(buffer);
 }
 
+bool BlockDecl::capturesVariable(const VarDecl *variable) const {
+  for (capture_const_iterator
+         i = capture_begin(), e = capture_end(); i != e; ++i)
+    // Only auto vars can be captured, so no redeclaration worries.
+    if (i->getVariable() == variable)
+      return true;
+
+  return false;
+}
+
 SourceRange BlockDecl::getSourceRange() const {
   return SourceRange(getLocation(), Body? Body->getLocEnd() : getLocation());
 }