vtables are part of the function_blocks

Author: ghaith

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,

libs/stdlib/src/counters.rs

@@ -5,6 +5,7 @@ use crate::utils::Signal;
 #[repr(C)]
 #[derive(Debug, Default)]
 pub struct CTUParams<T> {
+    __vtable: usize,
     cu: bool,
     r: bool,
     pv: T,
@@ -103,6 +104,7 @@ pub extern "C" fn CTU_ULINT(params: &mut CTUParams<u64>) {
 #[repr(C)]
 #[derive(Debug, Default)]
 pub struct CTDParams<T> {
+    __vtable: usize,
     cd: bool,
     ld: bool,
     pv: T,
@@ -201,6 +203,7 @@ pub extern "C" fn CTD_ULINT(params: &mut CTDParams<u64>) {
 #[repr(C)]
 #[derive(Debug, Default)]
 pub struct CTUDParams<T> {
+    __vtable: usize,
     cu: bool,
     cd: bool,
     r: bool,

libs/stdlib/src/flanks.rs

@@ -3,6 +3,7 @@ use crate::utils::Signal;
 #[derive(Debug, Default)]
 #[repr(C)]
 pub struct Trigger {
+    __vtable: usize,
     clk: bool,
     output: bool,
     internal: Signal,

libs/stdlib/src/timers.rs

@@ -15,6 +15,7 @@ pub type Time = i64;
 #[repr(C)]
 #[derive(Debug, Default)]
 pub struct TimerParams {
+    __vtable: usize,
     input: bool,
     preset_time: Time,
     output: bool,

src/codegen/generators/expression_generator.rs

@@ -723,15 +723,17 @@ impl<'ink, 'b> ExpressionCodeGenerator<'ink, 'b> {
     }
 
     fn generate_output_assignment(&self, context: &CallParameterAssignment) -> Result<(), Diagnostic> {
-        let &CallParameterAssignment { assignment: expr, function_name, index, parameter_struct } = context;
+        let &CallParameterAssignment { assignment: expr, function_name, index, parameter_struct } =
+            dbg!(context);
         let builder = &self.llvm.builder;
 
         // We don't want to generate any code if the right side of an assignment is empty, e.g. `foo(out =>)`
         if expr.is_empty_statement() {
             return Ok(());
         }
 
-        let parameter = self.index.get_declared_parameter(function_name, index).expect("must exist");
+        let parameter =
+            self.index.get_declared_parameter(dbg!(function_name), dbg!(index)).expect("must exist");
 
         match expr.get_stmt() {
             AstStatement::ReferenceExpr(_) if expr.has_direct_access() => {
@@ -2429,7 +2431,10 @@ impl<'ink, 'b> ExpressionCodeGenerator<'ink, 'b> {
                 )?;
                 (size, 1)
             }
-            _ => unreachable!("memcpy is not used for non-aggregate types"),
+            (left, right) => {
+                dbg!(left, right);
+                unreachable!("memcpy is not used for non-aggregate types")
+            }
         };
 
         self.llvm

src/codegen/tests/code_gen_tests.rs

@@ -1108,20 +1108,22 @@ fn fb_method_called_locally() {
     ; ModuleID = '<internal>'
     source_filename = "<internal>"
 
-    %foo = type { i32 }
+    %foo = type { i32*, i32 }
 
-    @__foo__init = unnamed_addr constant %foo { i32 42 }
+    @__foo__init = unnamed_addr constant %foo { i32* null, i32 42 }
 
     define void @foo(%foo* %0) {
     entry:
-      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %__vtable = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 1
       %call = call i32 @foo_addToBar(%foo* %0, i16 42)
       ret void
     }
 
     define i32 @foo_addToBar(%foo* %0, i16 %1) {
     entry:
-      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %__vtable = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 1
       %foo.addToBar = alloca i32, align 4
       %in = alloca i16, align 2
       store i16 %1, i16* %in, align 2
@@ -1191,20 +1193,22 @@ fn fb_local_method_var_shadows_parent_var() {
     ; ModuleID = '<internal>'
     source_filename = "<internal>"
 
-    %foo = type { i32 }
+    %foo = type { i32*, i32 }
 
-    @__foo__init = unnamed_addr constant %foo { i32 42 }
+    @__foo__init = unnamed_addr constant %foo { i32* null, i32 42 }
 
     define void @foo(%foo* %0) {
     entry:
-      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %__vtable = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 1
       %call = call i32 @foo_addToBar(%foo* %0, i16 42)
       ret void
     }
 
     define i32 @foo_addToBar(%foo* %0, i16 %1) {
     entry:
-      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %__vtable = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
+      %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 1
       %foo.addToBar = alloca i32, align 4
       %in = alloca i16, align 2
       store i16 %1, i16* %in, align 2
@@ -3953,9 +3957,9 @@ fn variables_in_var_external_block_are_not_generated() {
     ; ModuleID = '<internal>'
     source_filename = "<internal>"
 
-    %bar = type {}
+    %bar = type { i32* }
     %baz = type {}
-    %qux = type {}
+    %qux = type { i32* }
 
     @arr = global [101 x i16] zeroinitializer
     @__bar__init = unnamed_addr constant %bar zeroinitializer
@@ -3969,6 +3973,7 @@ fn variables_in_var_external_block_are_not_generated() {
 
     define void @bar(%bar* %0) {
     entry:
+      %__vtable = getelementptr inbounds %bar, %bar* %0, i32 0, i32 0
       ret void
     }
 
@@ -3979,6 +3984,7 @@ fn variables_in_var_external_block_are_not_generated() {
 
     define void @qux(%qux* %0) {
     entry:
+      %__vtable = getelementptr inbounds %qux, %qux* %0, i32 0, i32 0
       ret void
     }
     "#);

src/codegen/tests/debug_tests.rs

@@ -354,22 +354,24 @@ fn dbg_declare_has_valid_metadata_references_for_methods() {
     source_filename = "<internal>"
 
     %__vtable_fb = type { i32* }
-    %fb = type {}
+    %fb = type { i32* }
 
     @____vtable_fb__init = constant %__vtable_fb zeroinitializer, !dbg !0
     @__fb__init = constant %fb zeroinitializer, !dbg !8
     @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
 
-    define void @fb(%fb* %0) !dbg !16 {
+    define void @fb(%fb* %0) !dbg !17 {
     entry:
-      call void @llvm.dbg.declare(metadata %fb* %0, metadata !19, metadata !DIExpression()), !dbg !20
-      ret void, !dbg !20
+      call void @llvm.dbg.declare(metadata %fb* %0, metadata !21, metadata !DIExpression()), !dbg !22
+      %__vtable = getelementptr inbounds %fb, %fb* %0, i32 0, i32 0
+      ret void, !dbg !22
     }
 
-    define void @fb_foo(%fb* %0) !dbg !21 {
+    define void @fb_foo(%fb* %0) !dbg !23 {
     entry:
-      call void @llvm.dbg.declare(metadata %fb* %0, metadata !22, metadata !DIExpression()), !dbg !23
-      ret void, !dbg !23
+      call void @llvm.dbg.declare(metadata %fb* %0, metadata !24, metadata !DIExpression()), !dbg !25
+      %__vtable = getelementptr inbounds %fb, %fb* %0, i32 0, i32 0
+      ret void, !dbg !25
     }
 
     ; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
@@ -396,33 +398,35 @@ fn dbg_declare_has_valid_metadata_references_for_methods() {
 
     attributes #0 = { nofree nosync nounwind readnone speculatable willreturn }
 
-    !llvm.module.flags = !{!12, !13}
-    !llvm.dbg.cu = !{!14}
+    !llvm.module.flags = !{!13, !14}
+    !llvm.dbg.cu = !{!15}
 
     !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
     !1 = distinct !DIGlobalVariable(name: "____vtable_fb__init", scope: !2, file: !2, type: !3, isLocal: false, isDefinition: true)
     !2 = !DIFile(filename: "<internal>", directory: "")
     !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "__vtable_fb", scope: !2, file: !2, size: 64, align: 64, flags: DIFlagPublic, elements: !4, identifier: "__vtable_fb")
     !4 = !{!5}
     !5 = !DIDerivedType(tag: DW_TAG_member, name: "fb.foo", scope: !2, file: !2, baseType: !6, size: 64, align: 64, flags: DIFlagPublic)
-    !6 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "VOID_POINTER", baseType: !7, size: 64, align: 64, dwarfAddressSpace: 1)
+    !6 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "__VOID_POINTER", baseType: !7, size: 64, align: 64, dwarfAddressSpace: 1)
     !7 = !DIBasicType(name: "__VOID", encoding: DW_ATE_unsigned, flags: DIFlagPublic)
     !8 = !DIGlobalVariableExpression(var: !9, expr: !DIExpression())
     !9 = distinct !DIGlobalVariable(name: "__fb__init", scope: !2, file: !2, line: 2, type: !10, isLocal: false, isDefinition: true)
-    !10 = !DICompositeType(tag: DW_TAG_structure_type, name: "fb", scope: !2, file: !2, line: 2, align: 64, flags: DIFlagPublic, elements: !11, identifier: "fb")
-    !11 = !{}
-    !12 = !{i32 2, !"Dwarf Version", i32 5}
-    !13 = !{i32 2, !"Debug Info Version", i32 3}
-    !14 = distinct !DICompileUnit(language: DW_LANG_C, file: !2, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !15, splitDebugInlining: false)
-    !15 = !{!8, !0}
-    !16 = distinct !DISubprogram(name: "fb", linkageName: "fb", scope: !2, file: !2, line: 2, type: !17, scopeLine: 5, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !14, retainedNodes: !11)
-    !17 = !DISubroutineType(flags: DIFlagPublic, types: !18)
-    !18 = !{null, !10}
-    !19 = !DILocalVariable(name: "fb", scope: !16, file: !2, line: 5, type: !10)
-    !20 = !DILocation(line: 5, column: 8, scope: !16)
-    !21 = distinct !DISubprogram(name: "fb.foo", linkageName: "fb.foo", scope: !16, file: !2, line: 3, type: !17, scopeLine: 4, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !14, retainedNodes: !11)
-    !22 = !DILocalVariable(name: "fb", scope: !21, file: !2, line: 4, type: !10)
-    !23 = !DILocation(line: 4, column: 8, scope: !21)
+    !10 = !DICompositeType(tag: DW_TAG_structure_type, name: "fb", scope: !2, file: !2, line: 2, size: 64, align: 64, flags: DIFlagPublic, elements: !11, identifier: "fb")
+    !11 = !{!12}
+    !12 = !DIDerivedType(tag: DW_TAG_member, name: "__vtable", scope: !2, file: !2, baseType: !6, size: 64, align: 64, flags: DIFlagPublic)
+    !13 = !{i32 2, !"Dwarf Version", i32 5}
+    !14 = !{i32 2, !"Debug Info Version", i32 3}
+    !15 = distinct !DICompileUnit(language: DW_LANG_C, file: !2, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !16, splitDebugInlining: false)
+    !16 = !{!8, !0}
+    !17 = distinct !DISubprogram(name: "fb", linkageName: "fb", scope: !2, file: !2, line: 2, type: !18, scopeLine: 5, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !15, retainedNodes: !20)
+    !18 = !DISubroutineType(flags: DIFlagPublic, types: !19)
+    !19 = !{null, !10}
+    !20 = !{}
+    !21 = !DILocalVariable(name: "fb", scope: !17, file: !2, line: 5, type: !10)
+    !22 = !DILocation(line: 5, column: 8, scope: !17)
+    !23 = distinct !DISubprogram(name: "fb.foo", linkageName: "fb.foo", scope: !17, file: !2, line: 3, type: !18, scopeLine: 4, flags: DIFlagPublic, spFlags: DISPFlagDefinition, unit: !15, retainedNodes: !20)
+    !24 = !DILocalVariable(name: "fb", scope: !23, file: !2, line: 4, type: !10)
+    !25 = !DILocation(line: 4, column: 8, scope: !23)
     "#);
 }
 

src/codegen/tests/debug_tests/expression_debugging.rs

@@ -358,10 +358,10 @@ fn zero_sized_types_offset_and_size_are_correct() {
         END_VAR
         END_PROGRAM
 
-        FUNCTION_BLOCK zeroSize
+        PROGRAM zeroSize
             VAR
             END_VAR
-        END_FUNCTION_BLOCK
+        END_PROGRAM
         ",
     );
     // We expect the element after the zero sized member to have the offset same offset as the zero sized member

src/codegen/tests/debug_tests/snapshots/rusty__codegen__tests__debug_tests__expression_debugging__external_impl_is_not_added_as_external_subroutine.snap

@@ -1,13 +1,12 @@
 ---
 source: src/codegen/tests/debug_tests/expression_debugging.rs
 expression: result
-snapshot_kind: text
 ---
 ; ModuleID = '<internal>'
 source_filename = "<internal>"
 
 %myPrg = type {}
-%myFb = type {}
+%myFb = type { i32* }
 
 @myPrg_instance = external global %myPrg, !dbg !0
 @__myFb__init = external global %myFb, !dbg !5
@@ -18,8 +17,8 @@ declare void @myPrg(%myPrg*)
 
 declare void @myFb(%myFb*)
 
-!llvm.module.flags = !{!8, !9}
-!llvm.dbg.cu = !{!10}
+!llvm.module.flags = !{!12, !13}
+!llvm.dbg.cu = !{!14}
 
 !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
 !1 = distinct !DIGlobalVariable(name: "myPrg", scope: !2, file: !2, line: 4, type: !3, isLocal: false, isDefinition: true)
@@ -28,9 +27,13 @@ declare void @myFb(%myFb*)
 !4 = !{}
 !5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
 !6 = distinct !DIGlobalVariable(name: "__myFb__init", scope: !2, file: !2, line: 6, type: !7, isLocal: false, isDefinition: true)
-!7 = !DICompositeType(tag: DW_TAG_structure_type, name: "myFb", scope: !2, file: !2, line: 6, align: 64, flags: DIFlagPublic, elements: !4, identifier: "myFb")
-!8 = !{i32 2, !"Dwarf Version", i32 5}
-!9 = !{i32 2, !"Debug Info Version", i32 3}
-!10 = distinct !DICompileUnit(language: DW_LANG_C, file: !11, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !12, splitDebugInlining: false)
-!11 = !DIFile(filename: "<internal>", directory: "src")
-!12 = !{!0, !5}
+!7 = !DICompositeType(tag: DW_TAG_structure_type, name: "myFb", scope: !2, file: !2, line: 6, size: 64, align: 64, flags: DIFlagPublic, elements: !8, identifier: "myFb")
+!8 = !{!9}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "__vtable", scope: !2, file: !2, baseType: !10, size: 64, align: 64, flags: DIFlagPublic)
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "__VOID_POINTER", baseType: !11, size: 64, align: 64, dwarfAddressSpace: 1)
+!11 = !DIBasicType(name: "__VOID", encoding: DW_ATE_unsigned, flags: DIFlagPublic)
+!12 = !{i32 2, !"Dwarf Version", i32 5}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = distinct !DICompileUnit(language: DW_LANG_C, file: !15, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !16, splitDebugInlining: false)
+!15 = !DIFile(filename: "<internal>", directory: "src")
+!16 = !{!0, !5}