refactor(ModuleLifter): replace TypeLifter with DITypeLifter and update type handling in detectExternalFunctions

Author: badermarouan

include/IRDec/DITypeLifter.hpp

@@ -2,6 +2,7 @@
 #define GLU_IR_DEC_DI_TYPE_LIFTER_HPP
 
 #include "AST/ASTContext.hpp"
+#include "AST/Decls.hpp"
 #include "AST/Types.hpp"
 #include <llvm/IR/DebugInfoMetadata.h>
 
@@ -19,7 +20,7 @@ class DITypeLifter {
     /// @brief Lift a DIType to a GLU type
     /// @param diType The DIType to lift
     /// @return The lifted GLU type, or nullptr if the type could not be lifted
-    glu::types::TypeBase *lift(llvm::DIType const *diType) const;
+    glu::types::TypeBase *lift(llvm::DIType const *diType);
 
     /// @brief Handle a DIBasicType and lift it to a GLU type
     /// @param arena The memory arena to use for allocation
@@ -34,15 +35,29 @@ class DITypeLifter {
     /// @param diCompositeType The DICompositeType to handle
     /// @return The lifted GLU type, or nullptr if the type could not be lifted
     glu::types::TypeBase *
-    handleComposedTypes(llvm::DICompositeType const *diCompositeType) const;
+    handleComposedTypes(llvm::DICompositeType const *diCompositeType);
 
     /// @brief Handle a DIDerivedType and lift it to a GLU type
     /// @param typesArena The memory arena to use for type allocation
     /// @param astArena The memory arena to use for AST allocation
     /// @param diDerivedType The DIDerivedType to handle
     /// @return The lifted GLU type, or nullptr if the type could not be lifted
     glu::types::TypeBase *
-    handleDerivedType(llvm::DIDerivedType const *diDerivedType) const;
+    handleDerivedType(llvm::DIDerivedType const *diDerivedType);
+
+    /// @brief Handle a DISubroutineType and lift it to a GLU type
+    /// @param diSubroutineType The DISubroutineType to handle
+    /// @return The lifted GLU type, or nullptr if the type could not be lifted
+    glu::types::TypeBase *
+    handleSubroutineType(llvm::DISubroutineType const *diSubroutineType);
+
+    /// @brief Get the declaration bindings map
+    /// @return The declaration bindings map
+    llvm::DenseMap<llvm::DIType const *, glu::ast::DeclBase *> &
+    getDeclBindings()
+    {
+        return _declBindings;
+    }
 };
 
 } // namespace glu::irdec

lib/IRDec/ModuleLifter.cpp

@@ -1,6 +1,6 @@
 #include "ModuleLifter.hpp"
+#include "DITypeLifter.hpp"
 #include "GILGen/GILGen.hpp"
-#include "TypeLifter.hpp"
 #include "llvm/IR/Function.h"
 
 namespace glu::irdec {
@@ -39,13 +39,16 @@ class ModuleLifter {
 
     glu::ast::ModuleDecl *detectExternalFunctions()
     {
-        TypeLifter typeLifter(_astContext);
+        DITypeLifter typeLifter(_astContext);
         std::vector<glu::ast::DeclBase *> decls;
 
         for (auto &func : _llvmModule->functions()) {
             if (!func.isDeclaration()
                 && func.getLinkage() == llvm::Function::ExternalLinkage) {
-                auto type = typeLifter.lift(func.getFunctionType());
+                auto DIType = func.getSubprogram();
+                if (!DIType)
+                    continue;
+                auto type = typeLifter.lift(DIType->getType());
                 if (auto funcType
                     = llvm::dyn_cast_if_present<glu::types::FunctionTy>(type)) {
                     auto funcDecl
@@ -61,6 +64,10 @@ class ModuleLifter {
                 }
             }
         }
+
+        for (auto decl : typeLifter.getDeclBindings()) {
+            decls.push_back(decl.second);
+        }
         return _astContext.getASTMemoryArena().create<glu::ast::ModuleDecl>(
             SourceLocation::invalid, std::move(decls), &_astContext
         );