Adjustments

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 2b4a6d66f0bf0f8061302a42bbac824474811bdd..825b9c7c6712ad788c50fb055fd0aa482ede731a 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -338,7 +338,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                        csizeof.add_argument (new CCodeIdentifier (get_ccode_name (array_type.element_type)));
                        in_arg_map.set (get_param_pos (0.1), csizeof);
 
-                       CCodeExpression? free_func_expr = new CCodeIdentifier("NULL");
+                       CCodeExpression free_func_expr = new CCodeIdentifier("NULL");
                        if (array_type.element_type.value_owned) {
                                free_func_expr = get_destroy_func_expression(array_type.element_type);
                        }

diff --git a/tests/basic-types/arrays.c-expected b/tests/basic-types/arrays.c-expected
index 7839707a6bd9e09c6c7cf5495bcb122b7eef4128..6ffe7bb005832221584856338ae572078cc3604c 100644 (file)
--- a/tests/basic-types/arrays.c-expected
+++ b/tests/basic-types/arrays.c-expected
@@ -1763,6 +1763,9 @@ _vala_main (void)
        test_void_array ();
        test_explicit_copying ();
        test_array_with_primitives_move ();
+       test_array_with_struct_move (0, 2, 3, 1);
+       test_array_with_struct_move (2, 0, 3, 2);
+       test_array_with_struct_move (0, 3, 1, 1);
        test_array_resize ();
        test_struct_array ();
        test_fixed_array ();

diff --git a/tests/basic-types/arrays.vala b/tests/basic-types/arrays.vala
index 0a94a6acbf8e197237d237fa575c201c4616d51e..b269ce8ac66ecfef8f2700d0e93e1c28cf7a2f96 100644 (file)
--- a/tests/basic-types/arrays.vala
+++ b/tests/basic-types/arrays.vala
@@ -322,9 +322,9 @@ void main () {
        test_void_array ();
        test_explicit_copying ();
        test_array_with_primitives_move ();
-       //test_array_with_struct_move(0, 2, 3, 1);
-       //test_array_with_struct_move(2, 0, 3, 2);
-       //test_array_with_struct_move(0, 3, 1, 1);
+       test_array_with_struct_move(0, 2, 3, 1);
+       test_array_with_struct_move(2, 0, 3, 2);
+       test_array_with_struct_move(0, 3, 1, 1);
        test_array_resize ();
        test_struct_array ();
        test_fixed_array ();

diff --git a/tests/posix/arrays.c-expected b/tests/posix/arrays.c-expected
index 47710c9cfd58157efd0950d88a2ee2b01cdd4416..6f3b664f3bff4e7378d452ebe4fb1b67f7785b50 100644 (file)
--- a/tests/posix/arrays.c-expected
+++ b/tests/posix/arrays.c-expected
@@ -1718,6 +1718,9 @@ _vala_main (void)
        test_void_array ();
        test_explicit_copying ();
        test_array_with_primitives_move ();
+       test_array_with_struct_move (0, 2, 3, 1);
+       test_array_with_struct_move (2, 0, 3, 2);
+       test_array_with_struct_move (0, 3, 1, 1);
        test_array_resize ();
        test_struct_array ();
        test_fixed_array ();