fix get_size

Author: abroooo

src/codegen/tests/oop_tests/debug_tests.rs

@@ -91,9 +91,9 @@ fn members_from_base_class_are_available_in_subclasses() {
     !15 = !DISubrange(count: 11, lowerBound: 0)
     !16 = !DIGlobalVariableExpression(var: !17, expr: !DIExpression())
     !17 = distinct !DIGlobalVariable(name: "__bar__init", scope: !2, file: !2, line: 10, type: !18, isLocal: false, isDefinition: true)
-    !18 = !DICompositeType(tag: DW_TAG_structure_type, name: "bar", scope: !2, file: !2, line: 10, size: 7128, flags: DIFlagPublic, elements: !19, identifier: "bar")
+    !18 = !DICompositeType(tag: DW_TAG_structure_type, name: "bar", scope: !2, file: !2, line: 10, size: 7792, flags: DIFlagPublic, elements: !19, identifier: "bar")
     !19 = !{!20}
-    !20 = !DIDerivedType(tag: DW_TAG_member, name: "__foo", scope: !2, file: !2, baseType: !3, size: 7128, flags: DIFlagPublic)
+    !20 = !DIDerivedType(tag: DW_TAG_member, name: "__foo", scope: !2, file: !2, baseType: !3, size: 7792, flags: DIFlagPublic)
     !21 = !{i32 2, !"Dwarf Version", i32 5}
     !22 = !{i32 2, !"Debug Info Version", i32 3}
     !23 = distinct !DICompileUnit(language: DW_LANG_C, file: !2, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !24, splitDebugInlining: false)
@@ -216,9 +216,9 @@ fn write_to_parent_variable_qualified_access() {
     !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
     !1 = distinct !DIGlobalVariable(name: "__fb2__init", scope: !2, file: !2, line: 9, type: !3, isLocal: false, isDefinition: true)
     !2 = !DIFile(filename: "<internal>", directory: "")
-    !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "fb2", scope: !2, file: !2, line: 9, size: 16, flags: DIFlagPublic, elements: !4, identifier: "fb2")
+    !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "fb2", scope: !2, file: !2, line: 9, size: 32, flags: DIFlagPublic, elements: !4, identifier: "fb2")
     !4 = !{!5}
-    !5 = !DIDerivedType(tag: DW_TAG_member, name: "__fb", scope: !2, file: !2, baseType: !6, size: 16, flags: DIFlagPublic)
+    !5 = !DIDerivedType(tag: DW_TAG_member, name: "__fb", scope: !2, file: !2, baseType: !6, size: 32, flags: DIFlagPublic)
     !6 = !DICompositeType(tag: DW_TAG_structure_type, name: "fb", scope: !2, file: !2, line: 2, size: 32, flags: DIFlagPublic, elements: !7, identifier: "fb")
     !7 = !{!8, !10}
     !8 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !2, file: !2, line: 4, baseType: !9, size: 16, flags: DIFlagPublic)
@@ -228,9 +228,9 @@ fn write_to_parent_variable_qualified_access() {
     !12 = distinct !DIGlobalVariable(name: "__fb__init", scope: !2, file: !2, line: 2, type: !6, isLocal: false, isDefinition: true)
     !13 = !DIGlobalVariableExpression(var: !14, expr: !DIExpression())
     !14 = distinct !DIGlobalVariable(name: "__foo__init", scope: !2, file: !2, line: 12, type: !15, isLocal: false, isDefinition: true)
-    !15 = !DICompositeType(tag: DW_TAG_structure_type, name: "foo", scope: !2, file: !2, line: 12, size: 16, flags: DIFlagPublic, elements: !16, identifier: "foo")
+    !15 = !DICompositeType(tag: DW_TAG_structure_type, name: "foo", scope: !2, file: !2, line: 12, size: 32, flags: DIFlagPublic, elements: !16, identifier: "foo")
     !16 = !{!17}
-    !17 = !DIDerivedType(tag: DW_TAG_member, name: "myFb", scope: !2, file: !2, line: 14, baseType: !3, size: 16, flags: DIFlagPublic)
+    !17 = !DIDerivedType(tag: DW_TAG_member, name: "myFb", scope: !2, file: !2, line: 14, baseType: !3, size: 32, flags: DIFlagPublic)
     !18 = !{i32 2, !"Dwarf Version", i32 5}
     !19 = !{i32 2, !"Debug Info Version", i32 3}
     !20 = distinct !DICompileUnit(language: DW_LANG_C, file: !2, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !21, splitDebugInlining: false)
@@ -582,12 +582,12 @@ fn array_in_parent_generated() {
     !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
     !1 = distinct !DIGlobalVariable(name: "__child__init", scope: !2, file: !2, line: 16, type: !3, isLocal: false, isDefinition: true)
     !2 = !DIFile(filename: "<internal>", directory: "")
-    !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "child", scope: !2, file: !2, line: 16, size: 192, flags: DIFlagPublic, elements: !4, identifier: "child")
+    !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "child", scope: !2, file: !2, line: 16, size: 480, flags: DIFlagPublic, elements: !4, identifier: "child")
     !4 = !{!5, !22}
-    !5 = !DIDerivedType(tag: DW_TAG_member, name: "__parent", scope: !2, file: !2, baseType: !6, size: 16, flags: DIFlagPublic)
-    !6 = !DICompositeType(tag: DW_TAG_structure_type, name: "parent", scope: !2, file: !2, line: 9, size: 208, flags: DIFlagPublic, elements: !7, identifier: "parent")
+    !5 = !DIDerivedType(tag: DW_TAG_member, name: "__parent", scope: !2, file: !2, baseType: !6, size: 304, flags: DIFlagPublic)
+    !6 = !DICompositeType(tag: DW_TAG_structure_type, name: "parent", scope: !2, file: !2, line: 9, size: 304, flags: DIFlagPublic, elements: !7, identifier: "parent")
     !7 = !{!8, !17, !21}
-    !8 = !DIDerivedType(tag: DW_TAG_member, name: "__grandparent", scope: !2, file: !2, baseType: !9, size: 16, flags: DIFlagPublic)
+    !8 = !DIDerivedType(tag: DW_TAG_member, name: "__grandparent", scope: !2, file: !2, baseType: !9, size: 112, flags: DIFlagPublic)
     !9 = !DICompositeType(tag: DW_TAG_structure_type, name: "grandparent", scope: !2, file: !2, line: 2, size: 112, flags: DIFlagPublic, elements: !10, identifier: "grandparent")
     !10 = !{!11, !16}
     !11 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !2, file: !2, line: 4, baseType: !12, size: 96, flags: DIFlagPublic)
@@ -596,12 +596,12 @@ fn array_in_parent_generated() {
     !14 = !{!15}
     !15 = !DISubrange(count: 6, lowerBound: 0)
     !16 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !2, file: !2, line: 5, baseType: !13, size: 16, offset: 96, flags: DIFlagPublic)
-    !17 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !2, file: !2, line: 11, baseType: !18, size: 176, offset: 16, flags: DIFlagPublic)
+    !17 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !2, file: !2, line: 11, baseType: !18, size: 176, offset: 112, flags: DIFlagPublic)
     !18 = !DICompositeType(tag: DW_TAG_array_type, baseType: !13, size: 176, elements: !19)
     !19 = !{!20}
     !20 = !DISubrange(count: 11, lowerBound: 0)
-    !21 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !2, file: !2, line: 12, baseType: !13, size: 16, offset: 192, flags: DIFlagPublic)
-    !22 = !DIDerivedType(tag: DW_TAG_member, name: "z", scope: !2, file: !2, line: 18, baseType: !18, size: 176, offset: 16, flags: DIFlagPublic)
+    !21 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !2, file: !2, line: 12, baseType: !13, size: 16, offset: 288, flags: DIFlagPublic)
+    !22 = !DIDerivedType(tag: DW_TAG_member, name: "z", scope: !2, file: !2, line: 18, baseType: !18, size: 176, offset: 304, flags: DIFlagPublic)
     !23 = !DIGlobalVariableExpression(var: !24, expr: !DIExpression())
     !24 = distinct !DIGlobalVariable(name: "__parent__init", scope: !2, file: !2, line: 9, type: !6, isLocal: false, isDefinition: true)
     !25 = !DIGlobalVariableExpression(var: !26, expr: !DIExpression())
@@ -630,7 +630,7 @@ fn array_in_parent_generated() {
     !48 = !DISubroutineType(flags: DIFlagPublic, types: !49)
     !49 = !{null}
     !50 = !DILocalVariable(name: "arr", scope: !47, file: !2, line: 24, type: !51)
-    !51 = !DICompositeType(tag: DW_TAG_array_type, baseType: !3, size: 1936, elements: !19)
+    !51 = !DICompositeType(tag: DW_TAG_array_type, baseType: !3, size: 5280, elements: !19)
     !52 = !DILocation(line: 24, column: 12, scope: !47)
     !53 = !DILocation(line: 26, column: 12, scope: !47)
     !54 = !DILocation(line: 27, column: 12, scope: !47)
@@ -773,9 +773,9 @@ fn complex_array_access_generated() {
     !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
     !1 = distinct !DIGlobalVariable(name: "__parent__init", scope: !2, file: !2, line: 9, type: !3, isLocal: false, isDefinition: true)
     !2 = !DIFile(filename: "<internal>", directory: "")
-    !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "parent", scope: !2, file: !2, line: 9, size: 208, flags: DIFlagPublic, elements: !4, identifier: "parent")
+    !3 = !DICompositeType(tag: DW_TAG_structure_type, name: "parent", scope: !2, file: !2, line: 9, size: 304, flags: DIFlagPublic, elements: !4, identifier: "parent")
     !4 = !{!5, !14, !18}
-    !5 = !DIDerivedType(tag: DW_TAG_member, name: "__grandparent", scope: !2, file: !2, baseType: !6, size: 16, flags: DIFlagPublic)
+    !5 = !DIDerivedType(tag: DW_TAG_member, name: "__grandparent", scope: !2, file: !2, baseType: !6, size: 112, flags: DIFlagPublic)
     !6 = !DICompositeType(tag: DW_TAG_structure_type, name: "grandparent", scope: !2, file: !2, line: 2, size: 112, flags: DIFlagPublic, elements: !7, identifier: "grandparent")
     !7 = !{!8, !13}
     !8 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !2, file: !2, line: 4, baseType: !9, size: 96, flags: DIFlagPublic)
@@ -784,19 +784,19 @@ fn complex_array_access_generated() {
     !11 = !{!12}
     !12 = !DISubrange(count: 6, lowerBound: 0)
     !13 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !2, file: !2, line: 5, baseType: !10, size: 16, offset: 96, flags: DIFlagPublic)
-    !14 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !2, file: !2, line: 11, baseType: !15, size: 176, offset: 16, flags: DIFlagPublic)
+    !14 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !2, file: !2, line: 11, baseType: !15, size: 176, offset: 112, flags: DIFlagPublic)
     !15 = !DICompositeType(tag: DW_TAG_array_type, baseType: !10, size: 176, elements: !16)
     !16 = !{!17}
     !17 = !DISubrange(count: 11, lowerBound: 0)
-    !18 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !2, file: !2, line: 12, baseType: !10, size: 16, offset: 192, flags: DIFlagPublic)
+    !18 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !2, file: !2, line: 12, baseType: !10, size: 16, offset: 288, flags: DIFlagPublic)
     !19 = !DIGlobalVariableExpression(var: !20, expr: !DIExpression())
     !20 = distinct !DIGlobalVariable(name: "__grandparent__init", scope: !2, file: !2, line: 2, type: !6, isLocal: false, isDefinition: true)
     !21 = !DIGlobalVariableExpression(var: !22, expr: !DIExpression())
     !22 = distinct !DIGlobalVariable(name: "__child__init", scope: !2, file: !2, line: 16, type: !23, isLocal: false, isDefinition: true)
-    !23 = !DICompositeType(tag: DW_TAG_structure_type, name: "child", scope: !2, file: !2, line: 16, size: 192, flags: DIFlagPublic, elements: !24, identifier: "child")
+    !23 = !DICompositeType(tag: DW_TAG_structure_type, name: "child", scope: !2, file: !2, line: 16, size: 480, flags: DIFlagPublic, elements: !24, identifier: "child")
     !24 = !{!25, !26}
-    !25 = !DIDerivedType(tag: DW_TAG_member, name: "__parent", scope: !2, file: !2, baseType: !3, size: 16, flags: DIFlagPublic)
-    !26 = !DIDerivedType(tag: DW_TAG_member, name: "z", scope: !2, file: !2, line: 18, baseType: !15, size: 176, offset: 16, flags: DIFlagPublic)
+    !25 = !DIDerivedType(tag: DW_TAG_member, name: "__parent", scope: !2, file: !2, baseType: !3, size: 304, flags: DIFlagPublic)
+    !26 = !DIDerivedType(tag: DW_TAG_member, name: "z", scope: !2, file: !2, line: 18, baseType: !15, size: 176, offset: 304, flags: DIFlagPublic)
     !27 = !{i32 2, !"Dwarf Version", i32 5}
     !28 = !{i32 2, !"Debug Info Version", i32 3}
     !29 = distinct !DICompileUnit(language: DW_LANG_C, file: !2, producer: "RuSTy Structured text Compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !30, splitDebugInlining: false)

src/codegen/tests/snapshots/rusty__codegen__tests__debug_tests__global_var_nested_struct_added_to_debug_info.snap

@@ -42,11 +42,11 @@ entry:
 !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
 !1 = distinct !DIGlobalVariable(name: "__myStruct__init", scope: !2, file: !2, line: 2, type: !3, isLocal: false, isDefinition: true)
 !2 = !DIFile(filename: "<internal>", directory: "")
-!3 = !DICompositeType(tag: DW_TAG_structure_type, name: "myStruct", scope: !2, file: !2, line: 2, size: 96, flags: DIFlagPublic, elements: !4, identifier: "myStruct")
+!3 = !DICompositeType(tag: DW_TAG_structure_type, name: "myStruct", scope: !2, file: !2, line: 2, size: 128, flags: DIFlagPublic, elements: !4, identifier: "myStruct")
 !4 = !{!5, !7}
 !5 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !2, file: !2, line: 3, baseType: !6, size: 32, flags: DIFlagPublic)
 !6 = !DIBasicType(name: "DINT", size: 32, encoding: DW_ATE_signed, flags: DIFlagPublic)
-!7 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !2, file: !2, line: 4, baseType: !8, size: 64, offset: 32, flags: DIFlagPublic)
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !2, file: !2, line: 4, baseType: !8, size: 96, offset: 32, flags: DIFlagPublic)
 !8 = !DICompositeType(tag: DW_TAG_structure_type, name: "mystruct2", scope: !2, file: !2, line: 8, size: 96, flags: DIFlagPublic, elements: !9, identifier: "mystruct2")
 !9 = !{!10, !11}
 !10 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !2, file: !2, line: 9, baseType: !6, size: 32, flags: DIFlagPublic)

src/codegen/tests/snapshots/rusty__codegen__tests__debug_tests__global_var_struct_added_to_debug_info.snap

@@ -31,7 +31,7 @@ entry:
 !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
 !1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !2, line: 12, type: !3, isLocal: false, isDefinition: true)
 !2 = !DIFile(filename: "<internal>", directory: "")
-!3 = !DICompositeType(tag: DW_TAG_array_type, baseType: !4, size: 3872, elements: !12)
+!3 = !DICompositeType(tag: DW_TAG_array_type, baseType: !4, size: 4928, elements: !12)
 !4 = !DICompositeType(tag: DW_TAG_structure_type, name: "myStruct", scope: !2, file: !2, line: 2, size: 448, flags: DIFlagPublic, elements: !5, identifier: "myStruct")
 !5 = !{!6, !8, !10}
 !6 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !2, file: !2, line: 3, baseType: !7, size: 32, flags: DIFlagPublic)

src/datalayout.rs

@@ -186,8 +186,7 @@ mod tests {
 
         let struct_type = index.get_effective_type_by_name("MyStruct").unwrap().get_type_information();
         // And the struct size takes the alignment into account
-        // TODO: shouldn't the size be 120 bytes without alignment?
-        assert_eq!(struct_type.get_size(&index).unwrap().bits(), 64);
+        assert_eq!(struct_type.get_size(&index).unwrap().bits(), 120);
         // TODO: alignment
         // assert_eq!(struct_type.get_alignment(&index), Bytes::new(8)) //Struct alignment is 64 by default
     }

src/index/tests/index_tests.rs

@@ -2262,7 +2262,7 @@ fn pou_with_two_types_not_considered_recursive() {
     let (_, index) = index(
         "
         FUNCTION_BLOCK fb
-        VAR x,y : DINT; END_VAR
+        VAR x : DINT; END_VAR
         END_FUNCTION_BLOCK
         PROGRAM p
         VAR
@@ -2274,7 +2274,7 @@ fn pou_with_two_types_not_considered_recursive() {
 
     let pou_type = index.find_pou_type("p").unwrap();
     // TODO: why not 64 bytes?
-    assert_eq!(pou_type.get_type_information().get_size(&index).unwrap().bits(), 32);
+    assert_eq!(pou_type.get_type_information().get_size(&index).unwrap().bits(), 64);
 }
 
 #[test]

src/typesystem.rs

@@ -642,13 +642,13 @@ impl DataTypeInformation {
             DataTypeInformation::Struct { members, .. } => members
                 .iter()
                 .map(|it| it.get_type_name())
-                .try_fold(MemoryLocation::new(0), |_, it| {
+                .try_fold(MemoryLocation::new(0), |prev, it| {
                     let type_info: &DataTypeInformation = index.get_type_information_or_void(it);
                     let size = type_info.get_size_recursive(index, seen)?.value();
                     // TODO: alignment
                     // let after_align = prev.align_to(type_info.get_alignment(index)).value();
-                    // let res = after_align + size;
-                    Ok(MemoryLocation::new(size))
+                    let res = prev.value() + size;
+                    Ok(MemoryLocation::new(res))
                 })
                 .map(Into::into),
             DataTypeInformation::Array { inner_type_name, dimensions, .. } => {