Slightly improve source_reference for get_dup_func_expression()

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 0c79686de774b09eccc7667a979a23854683dcc7..54fc3e184f5fea758cbbb8dfede1257cf39e0cfe 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3083,7 +3083,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                                }
                        } else {
                                // duplicating non-reference counted objects may cause side-effects (and performance issues)
-                               Report.error (source_reference, "duplicating %s instance, use unowned variable or explicitly invoke copy method", type.type_symbol.name);
+                               Report.error (source_reference, "duplicating `%s' instance, use unowned variable or explicitly invoke copy method", type.type_symbol.name);
                                return new CCodeInvalidExpression();
                        }
 
@@ -4919,7 +4919,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                        arg_map.set (get_param_pos (0.1 * type_param_index + 0.02), get_type_id_expression (type_arg, is_chainup));
                        if (requires_copy (type_arg)) {
-                               var dup_func = get_dup_func_expression (type_arg, type_arg.source_reference, is_chainup);
+                               var dup_func = get_dup_func_expression (type_arg, type_arg.source_reference ?? expr.source_reference, is_chainup);
                                if (dup_func == null) {
                                        // type doesn't contain a copy function
                                        expr.error = true;

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 3a6e3f4f1409d9a7deea6bb7daac2443eb9a5b0d..95e49c56a911af9d5e18387121f6ae4036a8bff5 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1478,7 +1478,7 @@ public class Vala.GTypeModule : GErrorModule {
 
                                add_generic_accessor_function ("get_%s".printf (get_ccode_copy_function (p)),
                                                               "GBoxedCopyFunc",
-                                                              get_dup_func_expression (p_data_type, null),
+                                                              get_dup_func_expression (p_data_type, p_data_type.source_reference),
                                                               p, cl, iface);
 
                                add_generic_accessor_function ("get_%s".printf (get_ccode_destroy_function (p)),

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index fa101b6c8c9a73b51c4ca6d762a8bdc9678a7417..5536955680b220ffbcfd0dd6a332b1fae0c8e728 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -998,6 +998,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                        return generic_type;
                }
                actual_type = actual_type.copy ();
+               actual_type.source_reference = generic_type.source_reference;
                actual_type.value_owned = actual_type.value_owned && generic_type.value_owned;
                return actual_type;
        }

diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala
index b5594bfe0820965b93fafd48aec7d7a6faeb9b1e..4ac3fbd3c2a3ae0c2f840d8d11ed45ecfd90ef3b 100644 (file)
--- a/vala/valasymbolresolver.vala
+++ b/vala/valasymbolresolver.vala
@@ -427,7 +427,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 
                // still required for vapigen
                if (unresolved_type.unresolved_symbol.name == "void") {
-                       return new VoidType ();
+                       return new VoidType (unresolved_type.source_reference);
                }
 
                var sym = resolve_symbol (unresolved_type.unresolved_symbol);