fix: when generating debug info, only consider dependencies (#1450)

* fix: only consider dependant datatypes when building debug info

Author: ghaith

src/codegen/generators/data_type_generator.rs

@@ -118,7 +118,7 @@ pub fn generate_data_types<'ink>(
     }
 
     // Now generate debug information for all types
-    generator.generate_debug_types()?;
+    generator.generate_debug_types(&types_to_init)?;
 
     let mut tries = 0;
     let mut errors = FxHashMap::default();
@@ -465,24 +465,8 @@ impl<'ink> DataTypeGenerator<'ink, '_> {
         Ok(result)
     }
 
-    fn generate_debug_types(&mut self) -> Result<(), Diagnostic> {
-        for data_type in self
-            .index
-            .get_types()
-            .entries()
-            .flat_map(|(_, data_type)| data_type.first())
-            .filter(|data_type| !data_type.is_generic(self.index))
-        {
-            self.debug.register_debug_type(data_type.get_name(), data_type, self.index, &self.types_index)?;
-        }
-        for data_type in self
-            .index
-            .get_pou_types()
-            .entries()
-            .flat_map(|(_, data_type)| data_type.first())
-            .filter(|data_type| !data_type.is_generic(self.index))
-            .filter(|data_type| data_type.is_backed_by_struct())
-        {
+    fn generate_debug_types(&mut self, types: &VecDeque<(&str, &DataType)>) -> Result<(), Diagnostic> {
+        for (_, data_type) in types.iter().filter(|(_, data_type)| data_type.is_backed_by_struct()) {
             self.debug.register_debug_type(data_type.get_name(), data_type, self.index, &self.types_index)?;
         }
 

src/typesystem.rs

@@ -272,10 +272,6 @@ impl DataType {
         self.information.get_enum_variants()
     }
 
-    pub(crate) fn is_generic(&self, index: &Index) -> bool {
-        self.information.is_generic(index)
-    }
-
     pub(crate) fn is_backed_by_struct(&self) -> bool {
         if let DataTypeInformation::Struct { source: StructSource::Pou(pou_type), .. } =
             self.get_type_information()

tests/integration/build_description_tests.rs

@@ -156,3 +156,38 @@ fn build_with_clang_linker_windows() {
 
     assert!(dir.path().join("clang_proj.so").is_file());
 }
+
+#[test]
+#[serial]
+fn build_empty_project() {
+    let dir = tempfile::tempdir().unwrap();
+    let parameters = &[
+        "plc",
+        "build",
+        &get_test_file("empty_proj/conf/plc.json"),
+        "--target",
+        "x86_64-linux-gnu",
+        "--build-location",
+        dir.path().to_str().unwrap(),
+    ];
+    compile(parameters).unwrap();
+    assert!(dir.path().join("x86_64-linux-gnu").join("prog.so").is_file());
+}
+
+#[test]
+#[serial]
+fn build_empty_project_debug() {
+    let dir = tempfile::tempdir().unwrap();
+    let parameters = &[
+        "plc",
+        "build",
+        &get_test_file("empty_proj/conf/plc.json"),
+        "--target",
+        "x86_64-linux-gnu",
+        "--debug",
+        "--build-location",
+        dir.path().to_str().unwrap(),
+    ];
+    compile(parameters).unwrap();
+    assert!(dbg!(dir.path().join("x86_64-linux-gnu").join("prog.so")).is_file());
+}

tests/integration/data/empty_proj/conf/plc.json

@@ -0,0 +1,13 @@
+{
+	"name" : "EmptyProject",
+	"files" : [
+		"../src/**/*.st",
+		"../src/**/*.gvl",
+		"../conf/tasks/*.st"
+	],
+	"compile_type" : "Shared",
+	"output" : "prog.so",
+	"libraries" : [
+	]
+}
+

tests/integration/data/empty_proj/conf/tasks/mainTask.task.st

@@ -0,0 +1,3 @@
+FUNCTION mainTask : DINT
+    mainProg();
+END_FUNCTION

tests/integration/data/empty_proj/src/globals.gvl

@@ -0,0 +1,2 @@
+VAR_GLOBAL
+END_VAR

tests/integration/data/empty_proj/src/mainProg.st

@@ -0,0 +1,7 @@
+PROGRAM mainProg
+VAR
+
+END_VAR
+
+;
+END_PROGRAM

tests/integration/data/json/prog_with_globals.json

@@ -0,0 +1,11 @@
+{
+    "name": "proj",
+    "files": [
+        "mainProg.st",
+        "globals.st"
+    ],
+    "compile_type": "Shared",
+    "libraries": [
+    ],
+    "output": "proj.so"
+}