Moved LLVMGen to be a threadlocal variable in ParserState.py

Author: L3tum

.idea/workspace.xml

@@ -19,7 +19,7 @@ class ASTVisitor(Interpreter):
 
     def __init__(self):
         super().__init__()
-        self.llvmgen = LLVMGen()
+        self.llvmgen = ParserState.llvmgen()
 
     def transform_helper(self, node):
         if isinstance(node, Tree):

rial/ASTVisitor.py

@@ -21,7 +21,7 @@ class FunctionDeclarationTransformer(TransformerInterpreter):
 
     def __init__(self):
         super().__init__()
-        self.llvmgen = LLVMGen()
+        self.llvmgen = ParserState.llvmgen()
         self.mangling = True
 
     def attributed_func_decl(self, tree: Tree):

rial/FunctionDeclarationTransformer.py

@@ -16,9 +16,8 @@ class GlobalDeclarationTransformer(TransformerInterpreter):
 
     def __init__(self):
         super().__init__()
-        self.llvmgen = LLVMGen()
+        self.llvmgen = ParserState.llvmgen()
         self.ast_visitor = ASTVisitor()
-        self.ast_visitor.llvmgen = self.llvmgen
 
     def global_variable_decl(self, tree: Tree):
         body = tree.children[1].children

rial/GlobalDeclarationTransformer.py

@@ -22,6 +22,7 @@ class ParserState:
     cached_struct_modules: Dict[str, RIALModule]
     implemented_functions: List[str]
     threadLocalModule: threading.local
+    threadLocalLLVMGen: threading.local
     builtin_types: Dict[str, Dict[str, RIALFunction]]
 
     def __init__(self):
@@ -31,6 +32,7 @@ def __init__(self):
     def init():
         ParserState.implemented_functions = list()
         ParserState.threadLocalModule = threading.local()
+        ParserState.threadLocalLLVMGen = threading.local()
         ParserState.cached_functions = dict()
         ParserState.cached_struct_modules = dict()
         ParserState.builtin_types = dict()
@@ -43,6 +45,14 @@ def set_module(module: RIALModule):
     def module(cls) -> RIALModule:
         return cls.threadLocalModule.module
 
+    @staticmethod
+    def set_llvmgen(llvmgen):
+        ParserState.threadLocalLLVMGen.llvmgen = llvmgen
+
+    @classmethod
+    def llvmgen(cls):
+        return cls.threadLocalLLVMGen.llvmgen
+
     @staticmethod
     def add_dependency_and_wait(module_name: str):
         if Path(CompilationManager.path_from_mod_name(module_name)).exists():

rial/ParserState.py

@@ -15,7 +15,7 @@ class PrimitiveASTTransformer(Transformer_InPlaceRecursive):
 
     def __init__(self):
         super().__init__()
-        self.llvmgen = LLVMGen()
+        self.llvmgen = ParserState.llvmgen()
 
     def using(self, nodes):
         mod_name = ':'.join([node.value for node in nodes])

rial/PrimitiveASTTransformer.py

@@ -17,12 +17,9 @@ class StructDeclarationTransformer(TransformerInterpreter):
 
     def __init__(self):
         super().__init__()
-        self.llvmgen = LLVMGen()
+        self.llvmgen = ParserState.llvmgen()
         self.fdt = FunctionDeclarationTransformer()
 
-        # This guarantees that variables such as current_struct and the like are also visible in the FDT
-        self.fdt.llvmgen = self.llvmgen
-
     def struct_decl(self, tree: Tree):
         nodes: List = tree.children
         access_modifier = nodes[0].access_modifier

rial/StructDeclarationTransformer.py

@@ -16,6 +16,7 @@
 from rial.DesugarTransformer import DesugarTransformer
 from rial.FunctionDeclarationTransformer import FunctionDeclarationTransformer
 from rial.GlobalDeclarationTransformer import GlobalDeclarationTransformer
+from rial.LLVMGen import LLVMGen
 from rial.ParserState import ParserState
 from rial.PrimitiveASTTransformer import PrimitiveASTTransformer
 from rial.StructDeclarationTransformer import StructDeclarationTransformer
@@ -232,6 +233,7 @@ def compile_file(path: str):
         module = CompilationManager.codegen.get_module(module_name, filename,
                                                        str(CompilationManager.config.source_path))
         ParserState.set_module(module)
+        ParserState.set_llvmgen(LLVMGen())
 
         if not ParserState.module().name.startswith("rial:builtin:always_imported"):
             ParserState.module().dependencies.extend(CompilationManager.always_imported)