codegen: Resolve generics in sizeof-expression of parameter initializer

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0a2786158ca1196bd6a17f531600c3b505e70d2..9debfc7f3124aae05096bfa419af507c11b175fb 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -456,6 +456,7 @@ TESTS = \
        asynchronous/yield.vala \
        generics/constructor-chain-up.vala \
        generics/inference-static-function.vala \
+       generics/parameter-sizeof-initializer.vala \
        generics/bug640330.test \
        generics/bug640330.vala \
        generics/bug694765-1.vala \

diff --git a/tests/generics/parameter-sizeof-initializer.vala b/tests/generics/parameter-sizeof-initializer.vala
new file mode 100644 (file)
index 0000000..1dcc56e
--- /dev/null
+++ b/tests/generics/parameter-sizeof-initializer.vala
@@ -0,0 +1,28 @@
+[Compact]
+class Foo<G> {
+       public Foo (ulong real_foo, ulong foo = sizeof (G)) {
+               assert (foo == real_foo);
+       }
+
+       public void bar (ulong real_foo, ulong foo = sizeof (G)) {
+               assert (foo == real_foo);
+       }
+}
+
+void main () {
+       {
+               var garray = new GLib.Array<uint32> ();
+       }
+       {
+               var foo = new Foo<uint32> (sizeof (uint32));
+               foo.bar (4);
+       }
+       {
+               var foo = new Foo<int16> (sizeof (int16));
+               foo.bar (2);
+       }
+       {
+               var foo = new Foo<uint8> (sizeof (uint8));
+               foo.bar (1);
+       }
+}

diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index 80d0d772f5a961d6a1beab77d853b0a389741e57..c1b034fa33e56e9c1f5b0db75958a91019c920c7 100644 (file)
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -632,6 +632,15 @@ public class Vala.MethodCall : Expression {
                        return false;
                }
 
+               //Resolve possible generic-type in SizeofExpression used as parameter default-value
+               foreach (Expression arg in get_argument_list ()) {
+                       unowned SizeofExpression sizeof_expr = arg as SizeofExpression;
+                       if (sizeof_expr != null && sizeof_expr.type_reference is GenericType) {
+                               var sizeof_type = sizeof_expr.type_reference.get_actual_type (target_object_type, method_type_args, this);
+                               replace_expression (arg, new SizeofExpression (sizeof_type, source_reference));
+                       }
+               }
+
                /* Check for constructv chain up */
                if (base_cm != null && base_cm.is_variadic () && args.size == base_cm.get_parameters ().size) {
                        var this_last_arg = args[args.size-1];

diff --git a/vala/valaobjectcreationexpression.vala b/vala/valaobjectcreationexpression.vala
index 0b6a29391f1fb9ddb3b8b6a6dd94bbd098b4e1c3..5f4fce753eadfe4ea92a84d8aab16b5ea016004e 100644 (file)
--- a/vala/valaobjectcreationexpression.vala
+++ b/vala/valaobjectcreationexpression.vala
@@ -477,6 +477,15 @@ public class Vala.ObjectCreationExpression : Expression {
                        }
                }
 
+               //Resolve possible generic-type in SizeofExpression used as parameter default-value
+               foreach (Expression arg in get_argument_list ()) {
+                       unowned SizeofExpression sizeof_expr = arg as SizeofExpression;
+                       if (sizeof_expr != null && sizeof_expr.type_reference is GenericType) {
+                               var sizeof_type = sizeof_expr.type_reference.get_actual_type (type_reference, type_reference.get_type_arguments (), this);
+                               replace_expression (arg, new SizeofExpression (sizeof_type, source_reference));
+                       }
+               }
+
                foreach (MemberInitializer init in get_object_initializer ()) {
                        context.analyzer.visit_member_initializer (init, type_reference);
                }