change globvar string to real global variable

Author: varun-r-mallya

pythonbpf/vmlinux_parser/assignment_info.py

@@ -1,6 +1,7 @@
 from enum import Enum, auto
 from typing import Any, Dict, List, Optional, TypedDict
 from dataclasses import dataclass
+import llvmlite.ir as ir
 
 from pythonbpf.vmlinux_parser.dependency_node import Field
 
@@ -32,4 +33,4 @@ class AssignmentInfo(TypedDict):
     # The key of the dict is the name of the field.
     #   Value is a tuple that contains the global variable representing that field
     #   along with all the information about that field as a Field type.
-    members: Optional[Dict[str, tuple[str, Field]]]  # For structs.
+    members: Optional[Dict[str, tuple[ir.GlobalVariable, Field]]]  # For structs.

pythonbpf/vmlinux_parser/ir_gen/ir_generation.py

@@ -18,7 +18,7 @@ def __init__(self, llvm_module, handler: DependencyHandler, assignments):
         self.generated: list[str] = []
         self.generated_debug_info: list = []
         # Use struct_name and field_name as key instead of Field object
-        self.generated_field_names: dict[str, dict[str, str]] = {}
+        self.generated_field_names: dict[str, dict[str, ir.GlobalVariable]] = {}
         self.assignments: dict[str, AssignmentInfo] = assignments
         if not handler.is_ready:
             raise ImportError(
@@ -87,10 +87,10 @@ def struct_processor(self, struct, processing_stack=None):
                         struct.name in self.generated_field_names
                         and field_name in self.generated_field_names[struct.name]
                     ):
-                        field_co_re_name = self.generated_field_names[struct.name][
+                        field_global_variable = self.generated_field_names[struct.name][
                             field_name
                         ]
-                        members_dict[field_name] = (field_co_re_name, field)
+                        members_dict[field_name] = (field_global_variable, field)
                     else:
                         raise ValueError(
                             f"llvm global name not found for struct field {field_name}"
@@ -140,28 +140,28 @@ def gen_ir(self, struct, generated_debug_info):
                         field_co_re_name = self._struct_name_generator(
                             struct, field, field_index, True, 0, containing_type_size
                         )
-                        self.generated_field_names[struct.name][field_name] = (
-                            field_co_re_name
-                        )
                         globvar = ir.GlobalVariable(
                             self.llvm_module, ir.IntType(64), name=field_co_re_name
                         )
                         globvar.linkage = "external"
                         globvar.set_metadata("llvm.preserve.access.index", debug_info)
+                        self.generated_field_names[struct.name][field_name] = (
+                            globvar
+                        )
                         field_index += 1
                         continue
                     for i in range(0, array_size):
                         field_co_re_name = self._struct_name_generator(
                             struct, field, field_index, True, i, containing_type_size
                         )
-                        self.generated_field_names[struct.name][field_name] = (
-                            field_co_re_name
-                        )
                         globvar = ir.GlobalVariable(
                             self.llvm_module, ir.IntType(64), name=field_co_re_name
                         )
                         globvar.linkage = "external"
                         globvar.set_metadata("llvm.preserve.access.index", debug_info)
+                        self.generated_field_names[struct.name][field_name] = (
+                            globvar
+                        )
                     field_index += 1
             elif field.type_size is not None:
                 array_size = field.type_size
@@ -174,26 +174,26 @@ def gen_ir(self, struct, generated_debug_info):
                         field_co_re_name = self._struct_name_generator(
                             struct, field, field_index, True, i, containing_type_size
                         )
-                        self.generated_field_names[struct.name][field_name] = (
-                            field_co_re_name
-                        )
                         globvar = ir.GlobalVariable(
                             self.llvm_module, ir.IntType(64), name=field_co_re_name
                         )
                         globvar.linkage = "external"
                         globvar.set_metadata("llvm.preserve.access.index", debug_info)
+                        self.generated_field_names[struct.name][field_name] = (
+                            globvar
+                        )
                     field_index += 1
             else:
                 field_co_re_name = self._struct_name_generator(
                     struct, field, field_index
                 )
-                self.generated_field_names[struct.name][field_name] = field_co_re_name
                 field_index += 1
                 globvar = ir.GlobalVariable(
                     self.llvm_module, ir.IntType(64), name=field_co_re_name
                 )
                 globvar.linkage = "external"
                 globvar.set_metadata("llvm.preserve.access.index", debug_info)
+                self.generated_field_names[struct.name][field_name] = globvar
         return debug_info
 
     def _struct_name_generator(