Index: AvoidBindCheck.cpp
===================================================================
--- AvoidBindCheck.cpp	(revision 282328)
+++ AvoidBindCheck.cpp	(working copy)
@@ -109,7 +109,7 @@
 
   Finder->addMatcher(
       callExpr(callee(namedDecl(hasName("::std::bind"))),
-               hasArgument(0, declRefExpr(to(functionDecl().bind("f")))))
+               hasArgument(0, declRefExpr(to(functionDecl().bind("f"))).bind("ref")))
           .bind("bind"),
       this);
 }
@@ -148,10 +148,13 @@
 
   bool HasCapturedArgument = llvm::any_of(
       Args, [](const BindArgument &B) { return B.Kind == BK_Other; });
+  const auto *ref = Result.Nodes.getNodeAs<DeclRefExpr>("ref");
 
   Stream << "[" << (HasCapturedArgument ? "=" : "") << "]";
   addPlaceholderArgs(Args, Stream);
-  Stream << " { return " << F->getName() << "(";
+  Stream << " { return ";
+  ref->printPretty(Stream, nullptr, Result.Context->getPrintingPolicy());
+  Stream<< "(";
   addFunctionCallArgs(Args, Stream);
   Stream << "); };";