Merge branch 'master' into fbinit

Author: mhasel

src/codegen/debug.rs

@@ -762,7 +762,7 @@ impl<'ink> Debug<'ink> for DebugBuilder<'ink> {
 
             let variable_key = VariableKey::new(
                 variable.get_qualified_name(),
-                Some(function_scope.linking_context.get_call_name()),
+                Some(&function_scope.linking_context.get_call_name_for_ir()),
             );
             self.variables.insert(variable_key, debug_variable);
         }
@@ -801,7 +801,7 @@ impl<'ink> Debug<'ink> for DebugBuilder<'ink> {
 
             let variable_key = VariableKey::new(
                 variable.get_qualified_name(),
-                Some(function_scope.linking_context.get_call_name()),
+                Some(&function_scope.linking_context.get_call_name_for_ir()),
             );
             self.variables.insert(variable_key, debug_variable);
         }
@@ -819,7 +819,8 @@ impl<'ink> Debug<'ink> for DebugBuilder<'ink> {
             .get_subprogram()
             .map(|it| it.as_debug_info_scope())
             .unwrap_or_else(|| file.as_debug_info_scope());
-        let variable_key = VariableKey::new(name, Some(function_scope.linking_context.get_call_name()));
+        let variable_key =
+            VariableKey::new(name, Some(&function_scope.linking_context.get_call_name_for_ir()));
         if let Some(debug_type) = self.types.get(&name.to_lowercase()) {
             let debug_type = *debug_type;
             let line = function_scope.linking_context.get_location().get_line_plus_one() as u32;
@@ -865,7 +866,7 @@ impl<'ink> Debug<'ink> for DebugBuilder<'ink> {
             scope,
             None,
         );
-        let key = VariableKey::new(name, Some(function_scope.linking_context.get_call_name()));
+        let key = VariableKey::new(name, Some(&function_scope.linking_context.get_call_name_for_ir()));
         let variable = self.variables.get(&key);
         self.debug_info.insert_declare_at_end(value, variable.copied(), None, location, block);
     }

src/codegen/generators/expression_generator.rs

@@ -497,7 +497,7 @@ impl<'ink, 'b> ExpressionCodeGenerator<'ink, 'b> {
             .ok_or_else(|| Diagnostic::cannot_generate_call_statement(operator))?;
 
         let parameters_list = parameters.map(flatten_expression_list).unwrap_or_default();
-        let implementation_name = implementation.get_call_name();
+        let implementation_name = &implementation.get_call_name();
         // if the function is builtin, generate a basic value enum for it
         if let Some(builtin) = self.index.get_builtin_function(implementation_name) {
             // adr, ref, etc.
@@ -865,7 +865,7 @@ impl<'ink, 'b> ExpressionCodeGenerator<'ink, 'b> {
                     .ok_or_else(|| Diagnostic::cannot_generate_call_statement(operator))?;
 
                 self.generate_stateful_pou_arguments(
-                    implementation.get_call_name(),
+                    &implementation.get_call_name_for_ir(),
                     None,
                     call_ptr,
                     passed_parameters,
@@ -874,7 +874,7 @@ impl<'ink, 'b> ExpressionCodeGenerator<'ink, 'b> {
             _ => {
                 let call_ptr = self.generate_lvalue(operator)?;
                 self.generate_stateful_pou_arguments(
-                    implementation.get_call_name(),
+                    &implementation.get_call_name_for_ir(),
                     None,
                     call_ptr,
                     passed_parameters,

src/codegen/generators/pou_generator.rs

@@ -162,7 +162,7 @@ impl<'ink, 'cg> PouGenerator<'ink, 'cg> {
     }
 
     fn mangle_function(&self, implementation: &ImplementationIndexEntry) -> Result<String, Diagnostic> {
-        let ctx = SectionMangler::function(implementation.get_call_name().to_lowercase());
+        let ctx = SectionMangler::function(implementation.get_call_name_for_ir().to_lowercase());
 
         let params = self.index.get_declared_parameters(implementation.get_call_name());
 
@@ -279,7 +279,8 @@ impl<'ink, 'cg> PouGenerator<'ink, 'cg> {
 
         let function_declaration = self.create_llvm_function_type(parameters, variadic, return_type_llvm)?;
 
-        let curr_f = module.add_function(implementation.get_call_name(), function_declaration, None);
+        let curr_f: FunctionValue<'_> =
+            module.add_function(&implementation.get_call_name_for_ir(), function_declaration, None);
 
         let section_name = self.get_section(implementation)?;
         curr_f.set_section(section_name.as_deref());

src/codegen/generators/statement_generator.rs

@@ -805,8 +805,8 @@ impl<'a, 'b> StatementCodeGenerator<'a, 'b> {
                 //generate return void
                 self.llvm.builder.build_return(None);
             } else {
-                // renerate return statement
-                let call_name = self.function_context.linking_context.get_call_name();
+                // generate return statement
+                let call_name = &self.function_context.linking_context.get_call_name_for_ir();
                 let var_name = format!("{call_name}_ret"); // TODO: Naming convention (see plc_util/src/convention.rs)
                 let ret_name = ret_v.get_qualified_name();
                 let value_ptr =

src/codegen/tests/code_gen_tests.rs

@@ -1115,11 +1115,11 @@ fn fb_method_called_locally() {
     define void @foo(%foo* %0) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
-      %call = call i32 @foo.addToBar(%foo* %0, i16 42)
+      %call = call i32 @foo_addToBar(%foo* %0, i16 42)
       ret void
     }
 
-    define i32 @foo.addToBar(%foo* %0, i16 %1) {
+    define i32 @foo_addToBar(%foo* %0, i16 %1) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %foo.addToBar = alloca i32, align 4
@@ -1133,8 +1133,8 @@ fn fb_method_called_locally() {
       store i32 %tmpVar, i32* %bar, align 4
       %load_bar1 = load i32, i32* %bar, align 4
       store i32 %load_bar1, i32* %foo.addToBar, align 4
-      %foo.addToBar_ret = load i32, i32* %foo.addToBar, align 4
-      ret i32 %foo.addToBar_ret
+      %foo_addToBar_ret = load i32, i32* %foo.addToBar, align 4
+      ret i32 %foo_addToBar_ret
     }
 
     define void @main() {
@@ -1144,7 +1144,7 @@ fn fb_method_called_locally() {
       %0 = bitcast %foo* %fb to i8*
       call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %0, i8* align 1 bitcast (%foo* @__foo__init to i8*), i64 ptrtoint (%foo* getelementptr (%foo, %foo* null, i32 1) to i64), i1 false)
       store i32 0, i32* %x, align 4
-      %call = call i32 @foo.addToBar(%foo* %fb, i16 3)
+      %call = call i32 @foo_addToBar(%foo* %fb, i16 3)
       store i32 %call, i32* %x, align 4
       ret void
     }
@@ -1198,11 +1198,11 @@ fn fb_local_method_var_shadows_parent_var() {
     define void @foo(%foo* %0) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
-      %call = call i32 @foo.addToBar(%foo* %0, i16 42)
+      %call = call i32 @foo_addToBar(%foo* %0, i16 42)
       ret void
     }
 
-    define i32 @foo.addToBar(%foo* %0, i16 %1) {
+    define i32 @foo_addToBar(%foo* %0, i16 %1) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %foo.addToBar = alloca i32, align 4
@@ -1218,8 +1218,8 @@ fn fb_local_method_var_shadows_parent_var() {
       store i32 %tmpVar, i32* %bar1, align 4
       %load_bar2 = load i32, i32* %bar1, align 4
       store i32 %load_bar2, i32* %foo.addToBar, align 4
-      %foo.addToBar_ret = load i32, i32* %foo.addToBar, align 4
-      ret i32 %foo.addToBar_ret
+      %foo_addToBar_ret = load i32, i32* %foo.addToBar, align 4
+      ret i32 %foo_addToBar_ret
     }
 
     define void @main() {
@@ -1229,7 +1229,7 @@ fn fb_local_method_var_shadows_parent_var() {
       %0 = bitcast %foo* %fb to i8*
       call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %0, i8* align 1 bitcast (%foo* @__foo__init to i8*), i64 ptrtoint (%foo* getelementptr (%foo, %foo* null, i32 1) to i64), i1 false)
       store i32 0, i32* %x, align 4
-      %call = call i32 @foo.addToBar(%foo* %fb, i16 3)
+      %call = call i32 @foo_addToBar(%foo* %fb, i16 3)
       store i32 %call, i32* %x, align 4
       ret void
     }
@@ -1280,11 +1280,11 @@ fn prog_method_called_locally() {
     define void @foo(%foo* %0) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
-      %call = call i32 @foo.addToBar(%foo* %0, i16 42)
+      %call = call i32 @foo_addToBar(%foo* %0, i16 42)
       ret void
     }
 
-    define i32 @foo.addToBar(%foo* %0, i16 %1) {
+    define i32 @foo_addToBar(%foo* %0, i16 %1) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %foo.addToBar = alloca i32, align 4
@@ -1298,15 +1298,15 @@ fn prog_method_called_locally() {
       store i32 %tmpVar, i32* %bar, align 4
       %load_bar1 = load i32, i32* %bar, align 4
       store i32 %load_bar1, i32* %foo.addToBar, align 4
-      %foo.addToBar_ret = load i32, i32* %foo.addToBar, align 4
-      ret i32 %foo.addToBar_ret
+      %foo_addToBar_ret = load i32, i32* %foo.addToBar, align 4
+      ret i32 %foo_addToBar_ret
     }
 
     define void @main() {
     entry:
       %x = alloca i32, align 4
       store i32 0, i32* %x, align 4
-      %call = call i32 @foo.addToBar(%foo* @foo_instance, i16 3)
+      %call = call i32 @foo_addToBar(%foo* @foo_instance, i16 3)
       store i32 %call, i32* %x, align 4
       ret void
     }
@@ -1354,11 +1354,11 @@ fn prog_local_method_var_shadows_parent_var() {
     define void @foo(%foo* %0) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
-      %call = call i32 @foo.addToBar(%foo* %0, i16 42)
+      %call = call i32 @foo_addToBar(%foo* %0, i16 42)
       ret void
     }
 
-    define i32 @foo.addToBar(%foo* %0, i16 %1) {
+    define i32 @foo_addToBar(%foo* %0, i16 %1) {
     entry:
       %bar = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %foo.addToBar = alloca i32, align 4
@@ -1374,15 +1374,15 @@ fn prog_local_method_var_shadows_parent_var() {
       store i32 %tmpVar, i32* %bar1, align 4
       %load_bar2 = load i32, i32* %bar1, align 4
       store i32 %load_bar2, i32* %foo.addToBar, align 4
-      %foo.addToBar_ret = load i32, i32* %foo.addToBar, align 4
-      ret i32 %foo.addToBar_ret
+      %foo_addToBar_ret = load i32, i32* %foo.addToBar, align 4
+      ret i32 %foo_addToBar_ret
     }
 
     define void @main() {
     entry:
       %x = alloca i32, align 4
       store i32 0, i32* %x, align 4
-      %call = call i32 @foo.addToBar(%foo* @foo_instance, i16 3)
+      %call = call i32 @foo_addToBar(%foo* @foo_instance, i16 3)
       store i32 %call, i32* %x, align 4
       ret void
     }

src/codegen/tests/debug_tests.rs

@@ -364,7 +364,7 @@ fn dbg_declare_has_valid_metadata_references_for_methods() {
       ret void, !dbg !13
     }
 
-    define void @fb.foo(%fb* %0) !dbg !14 {
+    define void @fb_foo(%fb* %0) !dbg !14 {
     entry:
       call void @llvm.dbg.declare(metadata %fb* %0, metadata !15, metadata !DIExpression()), !dbg !16
       ret void, !dbg !16
@@ -457,7 +457,7 @@ fn action_with_var_temp() {
       call void @llvm.dbg.declare(metadata i32* %main, metadata !12, metadata !DIExpression()), !dbg !14
       store i32 0, i32* %main, align 4
       call void @PLC_PRG(%PLC_PRG* @PLC_PRG_instance), !dbg !15
-      call void @PLC_PRG.act(%PLC_PRG* @PLC_PRG_instance), !dbg !16
+      call void @PLC_PRG_act(%PLC_PRG* @PLC_PRG_instance), !dbg !16
       %main_ret = load i32, i32* %main, align 4, !dbg !17
       ret i32 %main_ret, !dbg !17
     }
@@ -472,7 +472,7 @@ fn action_with_var_temp() {
       ret void, !dbg !25
     }
 
-    define void @PLC_PRG.act(%PLC_PRG* %0) !dbg !26 {
+    define void @PLC_PRG_act(%PLC_PRG* %0) !dbg !26 {
     entry:
       call void @llvm.dbg.declare(metadata %PLC_PRG* %0, metadata !27, metadata !DIExpression()), !dbg !28
       %x = alloca i32, align 4

src/codegen/tests/initialization_test/complex_initializers.rs

@@ -388,15 +388,15 @@ fn nested_initializer_pous() {
     entry:
       %str_ref = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %b = getelementptr inbounds %foo, %foo* %0, i32 0, i32 1
-      call void @bar.print(%bar* %b)
+      call void @bar_print(%bar* %b)
       call void @bar(%bar* %b)
       ret void
     }
 
     define void @bar(%bar* %0) {
     entry:
       %b = getelementptr inbounds %bar, %bar* %0, i32 0, i32 0
-      call void @baz.print(%baz* %b)
+      call void @baz_print(%baz* %b)
       ret void
     }
 
@@ -418,24 +418,24 @@ fn nested_initializer_pous() {
       %other_ref_to_global = getelementptr inbounds %sideProg, %sideProg* %0, i32 0, i32 0
       %f = getelementptr inbounds %sideProg, %sideProg* %0, i32 0, i32 1
       call void @foo(%foo* %f)
-      call void @foo.print(%foo* %f)
+      call void @foo_print(%foo* %f)
       ret void
     }
 
-    define void @bar.print(%bar* %0) {
+    define void @bar_print(%bar* %0) {
     entry:
       %b = getelementptr inbounds %bar, %bar* %0, i32 0, i32 0
       ret void
     }
 
-    define void @foo.print(%foo* %0) {
+    define void @foo_print(%foo* %0) {
     entry:
       %str_ref = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %b = getelementptr inbounds %foo, %foo* %0, i32 0, i32 1
       ret void
     }
 
-    define void @baz.print(%baz* %0) {
+    define void @baz_print(%baz* %0) {
     entry:
       %str_ref = getelementptr inbounds %baz, %baz* %0, i32 0, i32 0
       ret void
@@ -824,7 +824,7 @@ fn stateful_pous_methods_and_structs_get_init_functions() {
       ret void
     }
 
-    define void @foo.m(%foo* %0) {
+    define void @foo_m(%foo* %0) {
     entry:
       ret void
     }
@@ -834,12 +834,12 @@ fn stateful_pous_methods_and_structs_get_init_functions() {
       ret void
     }
 
-    define void @cl.m(%cl* %0) {
+    define void @cl_m(%cl* %0) {
     entry:
       ret void
     }
 
-    define void @foo.act(%foo* %0) {
+    define void @foo_act(%foo* %0) {
     entry:
       ret void
     }
@@ -1640,7 +1640,7 @@ fn initializing_method_variables_with_refs() {
       ret void
     }
 
-    define void @foo.bar(%foo* %0) {
+    define void @foo_bar(%foo* %0) {
     entry:
       %x = alloca i32, align 4
       %px = alloca i32*, align 8
@@ -1707,7 +1707,7 @@ fn initializing_method_variables_with_refs_referencing_parent_pou_variable() {
       ret void
     }
 
-    define void @foo.bar(%foo* %0) {
+    define void @foo_bar(%foo* %0) {
     entry:
       %x = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %px = alloca i32*, align 8
@@ -1773,7 +1773,7 @@ fn initializing_method_variables_with_refs_referencing_global_variable() {
       ret void
     }
 
-    define void @foo.bar(%foo* %0) {
+    define void @foo_bar(%foo* %0) {
     entry:
       %px = alloca i32*, align 8
       store i32* @x, i32** %px, align 8
@@ -1839,7 +1839,7 @@ fn initializing_method_variables_with_refs_shadowing() {
       ret void
     }
 
-    define void @foo.bar(%foo* %0) {
+    define void @foo_bar(%foo* %0) {
     entry:
       %x = alloca i32, align 4
       %px = alloca i32*, align 8
@@ -1902,7 +1902,7 @@ fn initializing_method_variables_with_alias() {
       ret void
     }
 
-    define void @foo.bar(%foo* %0) {
+    define void @foo_bar(%foo* %0) {
     entry:
       %x = alloca i32, align 4
       %px = alloca i32*, align 8
@@ -1965,7 +1965,7 @@ fn initializing_method_variables_with_reference_to() {
       ret void
     }
 
-    define void @foo.bar(%foo* %0) {
+    define void @foo_bar(%foo* %0) {
     entry:
       %x = alloca i32, align 4
       %px = alloca i32*, align 8
@@ -2044,7 +2044,7 @@ fn methods_call_init_functions_for_their_members() {
       ret void
     }
 
-    define void @bar.baz(%bar* %0) {
+    define void @bar_baz(%bar* %0) {
     entry:
       %fb = alloca %foo, align 8
       %1 = bitcast %foo* %fb to i8*