test: fix failing tests introduced with previous commit

Author: volsa

compiler/plc_ast/src/pre_processor.rs

@@ -196,7 +196,6 @@ fn process_global_variables(unit: &mut CompilationUnit, id_provider: &mut IdProv
 }
 
 fn process_var_config_variables(unit: &mut CompilationUnit) {
-    let block = get_internal_global_block(unit);
     let variables = unit.var_config.iter().filter_map(|ConfigVariable { data_type, address, .. }| {
         let AstStatement::HardwareAccess(hardware) = &address.stmt else {
             unreachable!("Must be parsed as hardware access")
@@ -206,10 +205,12 @@ fn process_var_config_variables(unit: &mut CompilationUnit) {
             return None;
         }
 
+        // Check if the mangled variable already exists in any of the global variable blocks
+        // XXX: Not a fan of this, we should fix the underlying issue with variable block creation here...
         let name = hardware.get_mangled_variable_name();
-        if block.is_some_and(|it| it.variables.iter().any(|v| v.name == name)) {
-            return None;
-        };
+        if find_mangled_variable(unit, &name) {
+            return None; // Already exists, skip
+        }
 
         Some(Variable {
             name,
@@ -220,7 +221,7 @@ fn process_var_config_variables(unit: &mut CompilationUnit) {
         })
     });
 
-    update_generated_globals(unit, variables.collect())
+    update_generated_globals(unit, variables.collect());
 }
 
 fn update_generated_globals(unit: &mut CompilationUnit, mangled_globals: Vec<Variable>) {
@@ -242,11 +243,8 @@ fn update_generated_globals(unit: &mut CompilationUnit, mangled_globals: Vec<Var
     unit.global_vars.push(block);
 }
 
-fn get_internal_global_block(unit: &CompilationUnit) -> Option<&VariableBlock> {
-    unit.global_vars
-        .iter()
-        .position(|block| block.kind == VariableBlockType::Global && block.location.is_builtin_internal())
-        .and_then(|index| unit.global_vars.get(index))
+fn find_mangled_variable(unit: &CompilationUnit, name: &str) -> bool {
+    unit.global_vars.iter().flat_map(|block| &block.variables).any(|var| var.name == name)
 }
 
 fn build_enum_initializer(

compiler/plc_driver/src/runner.rs

@@ -66,7 +66,7 @@ pub fn compile<T: Compilable>(codegen_context: &CodegenContext, source: T) -> Ge
 pub fn compile_and_run<T, U, S: Compilable>(source: S, params: &mut T) -> U {
     let context: CodegenContext = CodegenContext::create();
     let module = compile(&context, source);
-    module.print_to_stderr();
+    // module.print_to_stderr();
     module.run::<T, U>("main", params)
 }
 
@@ -77,6 +77,6 @@ pub fn compile_and_run<T, U, S: Compilable>(source: S, params: &mut T) -> U {
 pub fn compile_and_run_no_params<U, S: Compilable>(source: S) -> U {
     let context: CodegenContext = CodegenContext::create();
     let module = compile(&context, source);
-    module.print_to_stderr();
+    // module.print_to_stderr();
     module.run_no_param::<U>("main")
 }

compiler/plc_driver/src/tests/multi_files.rs

@@ -159,7 +159,7 @@ fn forward_declared_constant_is_also_marked_constant() {
     let results = compile_with_root(vec![src1, src2], vec![], "root", DebugLevel::Full(5)).unwrap();
 
     // THEN the constant is marked as constant in the generated code
-    filtered_assert_snapshot!(results.join("\n"), @r###"
+    filtered_assert_snapshot!(results.join("\n"), @r#"
     ; ModuleID = 'external_file1.st'
     source_filename = "external_file1.st"
     target datalayout = "[filtered]"
@@ -194,9 +194,9 @@ fn forward_declared_constant_is_also_marked_constant() {
 
     declare void @__init_foo(%foo*)
 
-    declare !dbg !24 void @__user_init_foo(%foo*)
+    declare void @__user_init_foo(%foo*)
 
-    declare !dbg !29 void @mainProg(%mainProg*)
+    declare !dbg !24 void @mainProg(%mainProg*)
 
     ; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
     declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
@@ -234,17 +234,12 @@ fn forward_declared_constant_is_also_marked_constant() {
     !21 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: !11, file: !11, line: 12, type: !22, scopeLine: 16, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !8)
     !22 = !DISubroutineType(flags: DIFlagPublic, types: !23)
     !23 = !{null, !10}
-    !24 = distinct !DISubprogram(name: "__user_init_foo", linkageName: "__user_init_foo", scope: !25, file: !25, type: !26, scopeLine: 1, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !8)
-    !25 = !DIFile(filename: "__initializers", directory: "")
-    !26 = !DISubroutineType(flags: DIFlagPublic, types: !27)
-    !27 = !{null, !28}
-    !28 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "__auto_pointer_to_foo", baseType: !10, size: 64, align: 64, dwarfAddressSpace: 1)
-    !29 = distinct !DISubprogram(name: "mainProg", linkageName: "mainProg", scope: !11, file: !11, line: 6, type: !30, scopeLine: 10, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !8)
-    !30 = !DISubroutineType(flags: DIFlagPublic, types: !31)
-    !31 = !{null, !32, !14}
-    !32 = !DICompositeType(tag: DW_TAG_structure_type, name: "mainProg", scope: !11, file: !11, line: 6, size: 16, align: 64, flags: DIFlagPublic, elements: !33, identifier: "mainProg")
-    !33 = !{!34}
-    !34 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !11, file: !11, line: 8, baseType: !14, size: 16, align: 16, flags: DIFlagPublic)
+    !24 = distinct !DISubprogram(name: "mainProg", linkageName: "mainProg", scope: !11, file: !11, line: 6, type: !25, scopeLine: 10, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !8)
+    !25 = !DISubroutineType(flags: DIFlagPublic, types: !26)
+    !26 = !{null, !27, !14}
+    !27 = !DICompositeType(tag: DW_TAG_structure_type, name: "mainProg", scope: !11, file: !11, line: 6, size: 16, align: 64, flags: DIFlagPublic, elements: !28, identifier: "mainProg")
+    !28 = !{!29}
+    !29 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !11, file: !11, line: 8, baseType: !14, size: 16, align: 16, flags: DIFlagPublic)
 
     ; ModuleID = 'external_file2.st'
     source_filename = "external_file2.st"
@@ -380,5 +375,5 @@ fn forward_declared_constant_is_also_marked_constant() {
     declare void @mainProg(%mainProg*)
 
     declare void @__user_init_mainProg(%mainProg*)
-    "###);
+    "#);
 }

compiler/plc_source/src/source_location.rs

@@ -413,13 +413,18 @@ impl SourceLocation {
     }
 
     pub fn is_internal(&self) -> bool {
-        self.file.is_internal()
+        matches!(self.file, FileMarker::Internal(_)) | matches!(self.span, CodeSpan::None)
     }
 
     pub fn is_builtin_internal(&self) -> bool {
         self.file.is_internal() && self.span == CodeSpan::None
     }
 
+    // TODO: hmm, we definitely need at least one more is_internal function; fix before merge
+    pub fn is_internal_the_100th(&self) -> bool {
+        self.span == CodeSpan::None
+    }
+
     pub fn is_in_unit(&self, unit: impl AsRef<str>) -> bool {
         if let Some(filename) = self.get_file_name() {
             filename == unit.as_ref()

libs/stdlib/src/bistable_functionblocks.rs

@@ -1,6 +1,7 @@
 #[repr(C)]
 #[derive(Debug, Default)]
 pub struct SetResetParams {
+    __vtable: usize,
     set: bool,
     reset: bool,
     output: bool,
@@ -12,6 +13,21 @@ impl SetResetParams {
     }
 }
 
+#[repr(C)]
+pub struct VTable {
+    pub body: extern "C" fn(&mut SetResetParams),
+}
+
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+#[used]
+pub static __vtable_SR: VTable = VTable { body: SR };
+
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+#[used]
+pub static __SR__init: SetResetParams =
+    SetResetParams { __vtable: 0, set: false, reset: false, output: false };
 ///.
 /// Bistable function, set dominant
 ///
@@ -21,6 +37,17 @@ pub extern "C" fn SR(params: &mut SetResetParams) {
     params.set_output(params.set | (!params.reset & params.output));
 }
 
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+#[used]
+pub static __vtable_RS: VTable = VTable { body: RS };
+
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+#[used]
+pub static __RS__init: SetResetParams =
+    SetResetParams { __vtable: 0, set: false, reset: false, output: false };
+
 ///.
 /// Bistable function, reset dominant
 ///