Merge pull request #5263 from bob-wilson/code-completion-failure

bob-wilson · web-flow · commit 7a45dd7208df · 2016-10-12T19:42:22.000-07:00
Use std::function to fix unsafe use of llvm::function_ref.
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
@@ -302,7 +302,7 @@ static bool shouldHideDeclFromCompletionResults(const ValueDecl *D) {
   return false;
 }
 
-typedef llvm::function_ref<bool(ValueDecl*, DeclVisibilityKind)> DeclFilter;
+typedef std::function<bool(ValueDecl*, DeclVisibilityKind)> DeclFilter;
 DeclFilter DefaultFilter = [] (ValueDecl* VD, DeclVisibilityKind Kind) {return true;};
 DeclFilter KeyPathFilter = [](ValueDecl* decl, DeclVisibilityKind) -> bool {
   return isa<TypeDecl>(decl) ||

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ static bool shouldHideDeclFromCompletionResults(const ValueDecl *D) {`
`302`	`302`	`return false;`
`303`	`303`	`}`
`304`	`304`
`305`		`-typedef llvm::function_ref<bool(ValueDecl*, DeclVisibilityKind)> DeclFilter;`
	`305`	`+typedef std::function<bool(ValueDecl*, DeclVisibilityKind)> DeclFilter;`
`306`	`306`	`DeclFilter DefaultFilter = [] (ValueDecl* VD, DeclVisibilityKind Kind) {return true;};`
`307`	`307`	`DeclFilter KeyPathFilter = [](ValueDecl* decl, DeclVisibilityKind) -> bool {`
`308`	`308`	`return isa<TypeDecl>(decl) \|\|`