Revert "Teach CallGraph to look into Generic Lambdas."

This reverts commit bee81d3.

Author: haoNoQ

clang/include/clang/AST/DeclCXX.h

@@ -1212,10 +1212,6 @@ class CXXRecordDecl : public RecordDecl {
   /// if this is a closure type.
   CXXMethodDecl *getLambdaCallOperator() const;
 
-  /// Retrieve the dependent lambda call operator of the closure type
-  /// if this is a templated closure type.
-  FunctionTemplateDecl *getDependentLambdaCallOperator() const;
-
   /// Retrieve the lambda static invoker, the address of which
   /// is returned by the conversion operator, and the body of which
   /// is forwarded to the lambda call operator.

clang/include/clang/AST/ExprCXX.h

@@ -1902,10 +1902,6 @@ class LambdaExpr final : public Expr,
   /// lambda expression.
   CXXMethodDecl *getCallOperator() const;
 
-  /// Retrieve the function template call operator associated with this
-  /// lambda expression.
-  FunctionTemplateDecl *getDependentCallOperator() const;
-
   /// If this is a generic lambda expression, retrieve the template
   /// parameter list associated with it, or else return null.
   TemplateParameterList *getTemplateParameterList() const;

clang/lib/AST/DeclCXX.cpp

@@ -1369,25 +1369,17 @@ static bool allLookupResultsAreTheSame(const DeclContext::lookup_result &R) {
 }
 #endif
 
-NamedDecl* getLambdaCallOperatorHelper(const CXXRecordDecl &RD) {
-  if (!RD.isLambda()) return nullptr;
+CXXMethodDecl* CXXRecordDecl::getLambdaCallOperator() const {
+  if (!isLambda()) return nullptr;
   DeclarationName Name =
-    RD.getASTContext().DeclarationNames.getCXXOperatorName(OO_Call);
-  DeclContext::lookup_result Calls = RD.lookup(Name);
+    getASTContext().DeclarationNames.getCXXOperatorName(OO_Call);
+  DeclContext::lookup_result Calls = lookup(Name);
 
   assert(!Calls.empty() && "Missing lambda call operator!");
   assert(allLookupResultsAreTheSame(Calls) &&
          "More than one lambda call operator!");
-  return Calls.front();
-}
-
-FunctionTemplateDecl* CXXRecordDecl::getDependentLambdaCallOperator() const {
-  NamedDecl *CallOp = getLambdaCallOperatorHelper(*this);
-  return  dyn_cast<FunctionTemplateDecl>(CallOp);
-}
 
-CXXMethodDecl *CXXRecordDecl::getLambdaCallOperator() const {
-  NamedDecl *CallOp = getLambdaCallOperatorHelper(*this);
+  NamedDecl *CallOp = Calls.front();
   if (const auto *CallOpTmpl = dyn_cast<FunctionTemplateDecl>(CallOp))
     return cast<CXXMethodDecl>(CallOpTmpl->getTemplatedDecl());
 

clang/lib/AST/ExprCXX.cpp

@@ -1205,11 +1205,6 @@ CXXMethodDecl *LambdaExpr::getCallOperator() const {
   return Record->getLambdaCallOperator();
 }
 
-FunctionTemplateDecl *LambdaExpr::getDependentCallOperator() const {
-  CXXRecordDecl *Record = getLambdaClass();
-  return Record->getDependentLambdaCallOperator();
-}
-
 TemplateParameterList *LambdaExpr::getTemplateParameterList() const {
   CXXRecordDecl *Record = getLambdaClass();
   return Record->getGenericLambdaTemplateParameterList();

clang/lib/Analysis/CallGraph.cpp

@@ -80,10 +80,7 @@ class CGBuilder : public StmtVisitor<CGBuilder> {
   }
 
   void VisitLambdaExpr(LambdaExpr *LE) {
-    if (FunctionTemplateDecl *FTD = LE->getDependentCallOperator())
-      for (FunctionDecl *FD : FTD->specializations())
-        G->VisitFunctionDecl(FD);
-    else if (CXXMethodDecl *MD = LE->getCallOperator())
+    if (CXXMethodDecl *MD = LE->getCallOperator())
       G->VisitFunctionDecl(MD);
   }
 

clang/test/Analysis/debug-CallGraph.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_analyze_cc1 -analyzer-checker=debug.DumpCallGraph %s -fblocks -std=c++14 2>&1 | FileCheck %s
+// RUN: %clang_analyze_cc1 -analyzer-checker=debug.DumpCallGraph %s -fblocks 2>&1 | FileCheck %s
 
 int get5() {
   return 5;
@@ -68,25 +68,8 @@ void templUser() {
 }
 }
 
-namespace Lambdas {
-  void Callee(){}
-
-  void f1() {
-    [](int i) {
-      Callee();
-    }(1);
-    [](auto i) {
-      Callee();
-    }(1);
-  }
-}
-
 // CHECK:--- Call graph Dump ---
-// CHECK-NEXT: {{Function: < root > calls: get5 add test_add mmm foo aaa < > bbb ddd ccc eee fff do_nothing test_single_call SomeNS::templ SomeNS::templ SomeNS::templUser Lambdas::Callee Lambdas::f1 Lambdas::f1\(\)::\(anonymous class\)::operator\(\) Lambdas::f1\(\)::\(anonymous class\)::operator\(\) $}}
-// CHECK-NEXT: {{Function: Lambdas::f1 calls: Lambdas::f1\(\)::\(anonymous class\)::operator\(\) Lambdas::f1\(\)::\(anonymous class\)::operator\(\) $}}
-// CHECK-NEXT: {{Function: Lambdas::f1\(\)::\(anonymous class\)::operator\(\) calls: Lambdas::Callee $}}
-// CHECK-NEXT: {{Function: Lambdas::f1\(\)::\(anonymous class\)::operator\(\) calls: Lambdas::Callee $}}
-// CHECK-NEXT: {{Function: Lambdas::Callee calls: $}}
+// CHECK-NEXT: {{Function: < root > calls: get5 add test_add mmm foo aaa < > bbb ddd ccc eee fff do_nothing test_single_call SomeNS::templ SomeNS::templ SomeNS::templUser $}}
 // CHECK-NEXT: {{Function: SomeNS::templUser calls: SomeNS::templ SomeNS::templ $}}
 // CHECK-NEXT: {{Function: SomeNS::templ calls: eee $}}
 // CHECK-NEXT: {{Function: SomeNS::templ calls: ccc $}}