Slightly improve source_reference for get_dup_func_expression()

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 0e14461ab0f6169a4ff16af9b64efbf93b9d4fd7..ef7a1535eb3b5da08cb54e3213291ca9c490a186 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2924,7 +2924,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".printf (type.type_symbol.name));
+                               Report.error (source_reference, "duplicating `%s' instance, use unowned variable or explicitly invoke copy method".printf (type.type_symbol.name));
                                return new CCodeInvalidExpression();
                        }
 
@@ -4796,7 +4796,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 4f0ea8670065eaf8393aa844261fd640323a8de9..b9ff448ff7a01445ad20773bdff47c5b7d9b8b91 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1430,7 +1430,7 @@ public class Vala.GTypeModule : GErrorModule {
 
                                add_generic_accessor_function ("get_%s_dup_func".printf (p.name.ascii_down ()),
                                                               "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_destroy_func".printf (p.name.ascii_down ()),

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index fed1e86b04fa267acdb078c4c21531ce8091cb27..46857bd52d9abf7424d9b0b60fedd4ad33e3bb06 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1001,6 +1001,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 3f9bc6de00a370928b8cfd9c54294d4f2e5d9a94..98d5e150e726060d944fbc7b7d08a5a8d764e49e 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);