Use std::function to fix unsafe use of llvm::function_ref.

bob-wilson · bob-wilson · commit dfa207b7ae3c · 2016-10-12T16:44:11.000-07:00
This was exposed by building with a recent version of clang. Without this
change, the following tests were failing:

    Swift(macosx-x86_64) :: IDE/complete_assignment.swift
    Swift(macosx-x86_64) :: IDE/complete_enum_elements.swift
    Swift(macosx-x86_64) :: IDE/complete_stmt_controlling_expr.swift
    Swift(macosx-x86_64) :: SourceKit/CodeComplete/complete_structure.swift

I did not narrow it down to which uses of DeclFilter were problematic.
The global variables certainly do not seem like a good place to use a
function_ref. rdar://problem/28699882
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) \|\|`