Swift: update extractor to new IfConfigDecl

Author: redsun82

swift/extractor/infra/SwiftDispatcher.h

@@ -29,7 +29,6 @@ class SwiftDispatcher {
                                const swift::Pattern*,
                                const swift::TypeRepr*,
                                const swift::TypeBase*,
-                               const swift::IfConfigClause*,
                                FilePath>;
 
   template <typename E>
@@ -323,7 +322,6 @@ class SwiftDispatcher {
   // as we don't expect `nullptr` here. However `swift::ASTVisitor` and `swift::TypeVisitor` do not
   // accept const pointers
   virtual void visit(swift::Decl* decl) = 0;
-  virtual void visit(const swift::IfConfigClause* clause) = 0;
   virtual void visit(swift::Stmt* stmt) = 0;
   virtual void visit(const swift::StmtCondition* cond) = 0;
   virtual void visit(const swift::StmtConditionElement* cond) = 0;

swift/extractor/infra/SwiftTagTraits.h

@@ -49,7 +49,6 @@ MAP_TAG(Argument);
 #include <swift/AST/ExprNodes.def>
 
 MAP_TAG(Decl);
-MAP_TAG(IfConfigClause);
 #define ABSTRACT_DECL(CLASS, PARENT) MAP_SUBTAG(CLASS##Decl, PARENT)
 #define DECL(CLASS, PARENT) ABSTRACT_DECL(CLASS, PARENT)
 #include <swift/AST/DeclNodes.def>

swift/extractor/visitors/DeclVisitor.cpp

@@ -380,19 +380,10 @@ void DeclVisitor::fillAbstractStorageDecl(const swift::AbstractStorageDecl& decl
 
 codeql::IfConfigDecl DeclVisitor::translateIfConfigDecl(const swift::IfConfigDecl& decl) {
   auto entry = createEntry(decl);
-  //  entry.clauses = dispatcher_.fetchRepeatedLabels(decl.getClauses());
   if (auto activeClause = decl.getActiveClause()) {
-    entry.clauses.push_back(dispatcher_.fetchLabel(activeClause));
+    entry.active_elements = dispatcher_.fetchRepeatedLabels(activeClause->Elements);
   }
   return entry;
 }
 
-codeql::IfConfigClause DeclVisitor::translateIfConfigClause(const swift::IfConfigClause& clause) {
-  auto entry = dispatcher_.createEntry(clause);
-  //  entry.condition = dispatcher_.fetchOptionalLabel(clause.Cond);
-  entry.elements = dispatcher_.fetchRepeatedLabels(clause.Elements);
-  entry.is_active = clause.isActive;
-  return entry;
-}
-
 }  // namespace codeql

swift/extractor/visitors/DeclVisitor.h

@@ -16,10 +16,6 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {
   using AstVisitorBase<DeclVisitor>::AstVisitorBase;
   using AstVisitorBase<DeclVisitor>::visit;
 
-  void visit(const swift::IfConfigClause* clause) {
-    dispatcher_.emit(translateIfConfigClause(*clause));
-  }
-
   std::optional<codeql::ConcreteFuncDecl> translateFuncDecl(const swift::FuncDecl& decl);
   std::optional<codeql::ConstructorDecl> translateConstructorDecl(
       const swift::ConstructorDecl& decl);
@@ -50,7 +46,6 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {
   codeql::ImportDecl translateImportDecl(const swift::ImportDecl& decl);
   std::optional<codeql::ModuleDecl> translateModuleDecl(const swift::ModuleDecl& decl);
   codeql::IfConfigDecl translateIfConfigDecl(const swift::IfConfigDecl& decl);
-  codeql::IfConfigClause translateIfConfigClause(const swift::IfConfigClause& clause);
 
  private:
   std::string mangledName(const swift::ValueDecl& decl);

swift/extractor/visitors/SwiftVisitor.h

@@ -22,7 +22,6 @@ class SwiftVisitor : private SwiftDispatcher {
 
  private:
   void visit(swift::Decl* decl) override { declVisitor.visit(decl); }
-  void visit(const swift::IfConfigClause* clause) override { declVisitor.visit(clause); }
   void visit(swift::Stmt* stmt) override { stmtVisitor.visit(stmt); }
   void visit(const swift::StmtCondition* cond) override {
     emit(stmtVisitor.translateStmtCondition(*cond));