fix: Avoid vtable entries being removed

Author: volsa

compiler/plc_driver/src/pipelines/participant.rs

@@ -17,7 +17,7 @@ use plc::{
     index::{ArgumentType, PouIndexEntry, VariableIndexEntry},
     lowering::calls::AggregateTypeLowerer,
     output::FormatOption,
-    typesystem::{DataType, DataTypeInformation, VOID_TYPE},
+    typesystem::{DataType, DataTypeInformation, VOID_INTERNAL_NAME, VOID_TYPE},
     ConfigFormat, OnlineChange, Target,
 };
 use plc_diagnostics::diagnostics::Diagnostic;
@@ -289,7 +289,6 @@ impl PipelineParticipantMut for AggregateTypeLowerer {
 pub struct VTableIndexer;
 
 impl VTableIndexer {
-
     fn get_vtable_name(name: &str) -> String {
         format!("__vtable_{name}")
     }
@@ -300,7 +299,7 @@ impl VTableIndexer {
             let entry = VariableIndexEntry::new(
                 method.get_name(),
                 method.get_name(),
-                VOID_TYPE,
+                VOID_INTERNAL_NAME,
                 ArgumentType::ByRef(plc::index::VariableType::Local),
                 index as u32,
                 SourceLocation::internal(),
@@ -325,7 +324,7 @@ impl VTableIndexer {
 }
 
 impl PipelineParticipantMut for VTableIndexer {
-    fn post_index(&mut self, indexed_project: IndexedProject) -> IndexedProject {
+    fn pre_annotate(&mut self, indexed_project: IndexedProject) -> IndexedProject {
         //For each class or interface, create a vtable type
         //and add it to the index
         let IndexedProject { project, index, unresolvables } = indexed_project;
@@ -346,6 +345,7 @@ impl PipelineParticipantMut for VTableIndexer {
         for vtable in vtables {
             index.register_type(vtable);
         }
+
         IndexedProject { project, index, unresolvables }
     }
 }

src/codegen/generators/data_type_generator.rs

@@ -65,28 +65,33 @@ pub fn generate_data_types<'ink>(
     }
 
     for dep in dependencies {
-            if let Some(pou) = dep.get_pou(index) {
-                if !pou.is_generic() && !pou.is_action() {
-                    pou_types.push((dep.get_name(), pou.get_instance_struct_type_or_void(index)));
-                }
-            } else if let Some(datatype) = dep.get_type(index) {
-                if !datatype.get_type_information().is_generic(index) {
-                    types.push((dep.get_name(), datatype))
-                }
+        if let Some(pou) = dep.get_pou(index) {
+            if !pou.is_generic() && !pou.is_action() {
+                pou_types.push((dep.get_name(), pou.get_instance_struct_type_or_void(index)));
             }
-            if let Some(datatype) = dep.get_vtable(index) {
-                if !datatype.get_type_information().is_generic(index) {
-                    types.push((dep.get_name(), datatype))
-                }
+        } else if let Some(datatype) = dep.get_type(index) {
+            if !datatype.get_type_information().is_generic(index) {
+                types.push((dep.get_name(), datatype))
+            }
+        }
+
+        if let Some(datatype) = dbg!(dep.get_vtable(index)) {
+            if !datatype.get_type_information().is_generic(index) {
+                types.push((datatype.get_name(), datatype))
             }
+        }
     }
 
     let mut generator =
         DataTypeGenerator { llvm, debug, index, annotations, types_index: LlvmTypedIndex::default() };
 
+    // dbg!(&types);
     // first create all STUBs for struct types (empty structs)
     // and associate them in the llvm index
     for (name, user_type) in &types {
+        if *name == "__vtable_fb" {
+            eprintln!("hi")
+        }
         if let DataTypeInformation::Struct { name: struct_name, .. } = user_type.get_type_information() {
             generator.types_index.associate_type(name, llvm.create_struct_stub(struct_name).into())?;
         }