vala: Don't allow "va_list" as return-type or type of fields

Fixes https://gitlab.gnome.org/GNOME/vala/issues/884

diff --git a/tests/Makefile.am b/tests/Makefile.am
index db87cf3fea24dc96aecd334c86b91ec3dab49122..21bfb431e673e3f983c414e62d3706a08e9412cf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -714,6 +714,7 @@ TESTS = \
        semantic/constant-value-type.test \
        semantic/constant-void.test \
        semantic/construct-without-gobject.test \
+       semantic/delegate-return-valist.test \
        semantic/delegate-too-few-type-arguments.test \
        semantic/delegate-too-many-type-arguments.test \
        semantic/enum-empty.test \
@@ -727,6 +728,7 @@ TESTS = \
        semantic/field-non-constant.test \
        semantic/field-owned-to-unowned.test \
        semantic/field-static-instance-access.test \
+       semantic/field-valist.test \
        semantic/field-void.test \
        semantic/floating-reference.vala \
        semantic/foreach-iterator-args.test \
@@ -780,6 +782,7 @@ TESTS = \
        semantic/method-private-virtual.test \
        semantic/method-protected.test \
        semantic/method-return-accessibility.test \
+       semantic/method-return-valist.test \
        semantic/method-too-few-type-arguments.test \
        semantic/method-too-many-type-arguments.test \
        semantic/method-virtual.test \
@@ -822,6 +825,7 @@ TESTS = \
        semantic/signal-detail-non-string.test \
        semantic/struct-derived.test \
        semantic/signal-disconnect-invalid.test \
+       semantic/signal-return-valist.test \
        semantic/struct-field-initializer.test \
        semantic/struct-invalid-base.test \
        semantic/struct-recursive.test \

diff --git a/tests/semantic/delegate-return-valist.test b/tests/semantic/delegate-return-valist.test
new file mode 100644 (file)
index 0000000..b8300c9
--- /dev/null
+++ b/tests/semantic/delegate-return-valist.test
@@ -0,0 +1,6 @@
+Invalid Code
+
+delegate va_list Foo ();
+
+void main () {
+}

diff --git a/tests/semantic/field-valist.test b/tests/semantic/field-valist.test
new file mode 100644 (file)
index 0000000..9ba207a
--- /dev/null
+++ b/tests/semantic/field-valist.test
@@ -0,0 +1,6 @@
+Invalid Code
+
+va_list foo;
+
+void main () {
+}

diff --git a/tests/semantic/method-return-valist.test b/tests/semantic/method-return-valist.test
new file mode 100644 (file)
index 0000000..af0d566
--- /dev/null
+++ b/tests/semantic/method-return-valist.test
@@ -0,0 +1,8 @@
+Invalid Code
+
+va_list foo () {
+       return {};
+}
+
+void main () {
+}

diff --git a/tests/semantic/signal-return-valist.test b/tests/semantic/signal-return-valist.test
new file mode 100644 (file)
index 0000000..98aca13
--- /dev/null
+++ b/tests/semantic/signal-return-valist.test
@@ -0,0 +1,8 @@
+Invalid Code
+
+class Foo : Object {
+       public signal va_list bar ();
+}
+
+void main () {
+}

diff --git a/vala/valadelegate.vala b/vala/valadelegate.vala
index 200b2dbc20e1274e674b3d66a8a8cb80803c4f72..b9db0b287ba0d2037ccab30927439bd55a0ce85b 100644 (file)
--- a/vala/valadelegate.vala
+++ b/vala/valadelegate.vala
@@ -311,6 +311,12 @@ public class Vala.Delegate : TypeSymbol, Callable {
 
                return_type.check (context);
 
+               if (return_type.type_symbol == context.analyzer.va_list_type.type_symbol) {
+                       error = true;
+                       Report.error (source_reference, "`%s' not supported as return type".printf (return_type.type_symbol.get_full_name ()));
+                       return false;
+               }
+
                foreach (Parameter param in parameters) {
                        param.check (context);
                }

diff --git a/vala/valafield.vala b/vala/valafield.vala
index f3a81f0e35e18fbe2b96458355789ded23957fd5..dc4cde63e11ff18daff4f36ceac8e07b9f4797b0 100644 (file)
--- a/vala/valafield.vala
+++ b/vala/valafield.vala
@@ -98,6 +98,12 @@ public class Vala.Field : Variable, Lockable {
                        return false;
                }
 
+               if (variable_type.type_symbol == context.analyzer.va_list_type.type_symbol) {
+                       error = true;
+                       Report.error (source_reference, "`%s' not supported as field type".printf (variable_type.type_symbol.get_full_name ()));
+                       return false;
+               }
+
                variable_type.check (context);
                if (!external_package) {
                        context.analyzer.check_type (variable_type);

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index 1be97ab21f2ee6f5920e609fa4a9ce3ede42baab..b1b4cc77c4768f120a7521e235b59e24618dc3ae 100644 (file)
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -793,6 +793,12 @@ public class Vala.Method : Subroutine, Callable {
                        context.analyzer.check_type (return_type);
                }
 
+               if (return_type.type_symbol == context.analyzer.va_list_type.type_symbol) {
+                       error = true;
+                       Report.error (source_reference, "`%s' not supported as return type".printf (return_type.type_symbol.get_full_name ()));
+                       return false;
+               }
+
                var init_attr = get_attribute ("ModuleInit");
                if (init_attr != null) {
                        source_reference.file.context.module_init_method = this;

diff --git a/vala/valasignal.vala b/vala/valasignal.vala
index 66c7a89c2a63ef6f2ee7f8682e8acb10b30abb94..c6390c0a39397f39dc833d2261051bd6fbccab22 100644 (file)
--- a/vala/valasignal.vala
+++ b/vala/valasignal.vala
@@ -205,6 +205,12 @@ public class Vala.Signal : Symbol, Callable {
 
                return_type.check (context);
 
+               if (return_type.type_symbol == context.analyzer.va_list_type.type_symbol) {
+                       error = true;
+                       Report.error (source_reference, "`%s' not supported as return type".printf (return_type.type_symbol.get_full_name ()));
+                       return false;
+               }
+
                foreach (Parameter param in parameters) {
                        if (param.ellipsis) {
                                Report.error  (param.source_reference, "Signals with variable argument lists are not supported");