call Decl::setImplicit for implicit instantiations of variables and functions

Author: sdkrystian

source/AST/ASTVisitor.cpp

@@ -569,20 +569,6 @@ shouldExtract(
     return true;
 }
 
-template<typename DeclTy>
-bool
-ASTVisitor::
-isImplicitInstantiation(
-    const DeclTy* D)
-{
-    if constexpr(requires { { D->getTemplateSpecializationKind() } ->
-        std::same_as<TemplateSpecializationKind>; })
-        return D->getTemplateSpecializationKind() ==
-            TemplateSpecializationKind::TSK_ImplicitInstantiation;
-    else
-        return false;
-}
-
 bool
 ASTVisitor::
 extractInfo(
@@ -1198,10 +1184,6 @@ Traverse(
     AccessSpecifier A,
     std::unique_ptr<TemplateInfo>&& Template = nullptr)
 {
-    // implicit instantiations should *only* have their Info
-    // extracted via buildSpecialization calls from getParentNamespaces
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1258,13 +1240,6 @@ Traverse(
     AccessSpecifier A,
     std::unique_ptr<TemplateInfo>&& Template = nullptr)
 {
-    // implicitly instantiated definitions of non-inline
-    // static data members of class templates are added to
-    // the end of the TU DeclContext. Decl::isImplicit returns
-    // false for these VarDecls, so we must check whether this
-    // variable is an implicit instantiation & skip such Decls
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1283,8 +1258,6 @@ Traverse(
     AccessSpecifier A,
     std::unique_ptr<TemplateInfo>&& Template = nullptr)
 {
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1304,8 +1277,6 @@ Traverse(
     AccessSpecifier A,
     std::unique_ptr<TemplateInfo>&& Template = nullptr)
 {
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1331,8 +1302,6 @@ Traverse(
     if(DN)
         s = DN.getAsString();
     */
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1351,8 +1320,6 @@ Traverse(
     AccessSpecifier A,
     std::unique_ptr<TemplateInfo>&& Template = nullptr)
 {
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1371,8 +1338,6 @@ Traverse(
     AccessSpecifier A,
     std::unique_ptr<TemplateInfo>&& Template = nullptr)
 {
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1387,8 +1352,6 @@ Traverse(
     CXXDestructorDecl* D,
     AccessSpecifier A)
 {
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1415,8 +1378,6 @@ Traverse(
     EnumDecl* D,
     AccessSpecifier A)
 {
-    if(isImplicitInstantiation(D))
-        return true;
     if(! shouldExtract(D))
         return true;
 
@@ -1812,5 +1773,23 @@ ForgetSema()
     sema_ = nullptr;
 }
 
+void
+ASTVisitor::
+HandleCXXStaticMemberVarInstantiation(VarDecl* D)
+{
+    // implicitly instantiated definitions of non-inline
+    // static data members of class templates are added to
+    // the end of the TU DeclContext. Decl::isImplicit returns
+    // false for these VarDecls, so we manually set it here.
+    D->setImplicit();
+}
+
+void
+ASTVisitor::
+HandleCXXImplicitFunctionInstantiation(FunctionDecl* D)
+{
+    D->setImplicit();
+}
+
 } // mrdox
 } // clang

source/AST/ASTVisitor.hpp

@@ -85,11 +85,6 @@ class ASTVisitor
     shouldExtract(
         const Decl* D);
 
-    template<typename DeclTy>
-    bool
-    isImplicitInstantiation(
-        const DeclTy* D);
-
     bool
     extractInfo(
         Info& I,
@@ -303,6 +298,8 @@ class ASTVisitor
     void InitializeSema(Sema& S) override;
     void ForgetSema() override;
 
+    void HandleCXXStaticMemberVarInstantiation(VarDecl* D) override;
+    void HandleCXXImplicitFunctionInstantiation(FunctionDecl* D) override;
 };
 
 } // mrdox