remove compile error on normal c_void_p in arg and separate localsymbol to avoid circular dep

Author: varun-r-mallya

pythonbpf/allocation_pass.py

@@ -2,8 +2,7 @@
 import logging
 
 from llvmlite import ir
-from dataclasses import dataclass
-from typing import Any
+from .local_symbol import LocalSymbol
 from pythonbpf.helper import HelperHandlerRegistry
 from pythonbpf.vmlinux_parser.dependency_node import Field
 from .expr import VmlinuxHandlerRegistry
@@ -12,18 +11,6 @@
 logger = logging.getLogger(__name__)
 
 
-@dataclass
-class LocalSymbol:
-    var: ir.AllocaInstr
-    ir_type: ir.Type
-    metadata: Any = None
-
-    def __iter__(self):
-        yield self.var
-        yield self.ir_type
-        yield self.metadata
-
-
 def create_targets_and_rvals(stmt):
     """Create lists of targets and right-hand values from an assignment statement."""
     if isinstance(stmt.targets[0], ast.Tuple):

pythonbpf/functions/functions_pass.py

@@ -351,18 +351,8 @@ def process_func_body(
                 context_type = LocalSymbol(
                     None, ir.PointerType(resolved_type), resolved_type
                 )
-            else:
-                try:
-                    resolved_type = ctypes_to_ir(context_type_name)
-                    logger.error("THIS SHOULD NOT HAPPEN. I THINK. PROBABLY.")
-                    context_type = LocalSymbol(
-                        None, ir.PointerType(resolved_type), resolved_type
-                    )
-                except Exception:
-                    raise TypeError(f"Type '{context_type_name}' not declared")
-
-            local_sym_tab[context_name] = context_type
-            logger.info(f"Added argument '{context_name}' to local symbol table")
+                local_sym_tab[context_name] = context_type
+                logger.info(f"Added argument '{context_name}' to local symbol table")
 
     # pre-allocate dynamic variables
     local_sym_tab = allocate_mem(

pythonbpf/local_symbol.py

@@ -0,0 +1,15 @@
+import llvmlite.ir as ir
+from dataclasses import dataclass
+from typing import Any
+
+
+@dataclass
+class LocalSymbol:
+    var: ir.AllocaInstr
+    ir_type: ir.Type
+    metadata: Any = None
+
+    def __iter__(self):
+        yield self.var
+        yield self.ir_type
+        yield self.metadata

pythonbpf/vmlinux_parser/vmlinux_exports_handler.py

@@ -1,6 +1,7 @@
 import logging
 from llvmlite import ir
 
+from pythonbpf.local_symbol import LocalSymbol
 from pythonbpf.vmlinux_parser.assignment_info import AssignmentType
 
 logger = logging.getLogger(__name__)
@@ -88,10 +89,12 @@ def handle_vmlinux_struct_field(
     ):
         """Handle access to vmlinux struct fields"""
         if struct_var_name in local_sym_tab:
-            var_info = local_sym_tab[struct_var_name]
+            var_info: LocalSymbol = local_sym_tab[struct_var_name]
             logger.info(
                 f"Attempting to access field {field_name} of possible vmlinux struct {struct_var_name}"
             )
+            print(var_info.ir_type)
+            print(self.get_field_type(struct_var_name, field_name))
             # Return pointer to field and field type
             return None
         else: