Remove the EnumConstantTable

We don't need it anymore, LLVM-17 seems to have a way to get the EnumDecl which results in the EnumConstantDecl. Signed-off-by: Giuliano Belinassi <[email protected]>
SUSE · Jul 21, 2024 · 9b2dfb6 · 9b2dfb6
1 parent 6054fa3
commit 9b2dfb6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 141 deletions.
diff --git a/libcextract/Closure.hh b/libcextract/Closure.hh
@@ -21,7 +21,6 @@
 #include <clang/AST/RecursiveASTVisitor.h>
 #include <unordered_set>
 
-#include "EnumConstTbl.hh"
 #include "LLVMMisc.hh"
 
 using namespace clang;
@@ -134,8 +133,7 @@ class DeclClosureVisitor : public RecursiveASTVisitor<DeclClosureVisitor>
   public:
   DeclClosureVisitor(ASTUnit *ast)
     : RecursiveASTVisitor(),
-      AST(ast),
-      EnumTable(ast)
+      AST(ast)
   {
   }
 
@@ -320,7 +318,7 @@ class DeclClosureVisitor : public RecursiveASTVisitor<DeclClosureVisitor>
   bool VisitEnumConstantDecl(EnumConstantDecl *decl)
   {
     /* Add original EnumDecl it originated.  */
-    EnumDecl *enum_decl = EnumTable.Get(decl);
+    EnumDecl *enum_decl = dyn_cast<EnumDecl>(decl->getLexicalDeclContext());
     if (enum_decl) {
       return TraverseDecl(enum_decl);
     }
@@ -549,10 +547,6 @@ class DeclClosureVisitor : public RecursiveASTVisitor<DeclClosureVisitor>
       may be (?) the ideal datastructure for this.  */
   ClosureSet Closure;
 
-  /** The table maping EnumConstantDecl to its original EnumDecl, used to find
-      out where a certain EnumConstantDecl was defined.  */
-  EnumConstantTable EnumTable;
-
   /** The set of all analyzed Decls.  */
   std::unordered_set<Decl *> AnalyzedDecls;
 #undef TRY_TO

diff --git a/libcextract/EnumConstTbl.cpp b/libcextract/EnumConstTbl.cpp
diff --git a/libcextract/EnumConstTbl.hh b/libcextract/EnumConstTbl.hh
diff --git a/libcextract/FunctionDepsFinder.hh b/libcextract/FunctionDepsFinder.hh
@@ -15,7 +15,6 @@
 
 #pragma once
 
-#include "EnumConstTbl.hh"
 #include "MacroWalker.hh"
 #include "IncludeTree.hh"
 #include "PrettyPrint.hh"

diff --git a/libcextract/meson.build b/libcextract/meson.build
@@ -17,7 +17,6 @@ libcextract_sources = [
   'ArgvParser.cpp',
   'DscFileGenerator.cpp',
   'ElfCXX.cpp',
-  'EnumConstTbl.cpp',
   'Error.cpp',
   'FunctionDepsFinder.cpp',
   'FunctionExternalizeFinder.cpp',