From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 3 Aug 2023 15:17:23 +0000 (+0200)
Subject: Remove error
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e059e1023a527d282f8006f5e3d8c30135274ecd;p=thirdparty%2Fvala.git

Remove error
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 67efd975d..41bce8c4f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -843,6 +843,7 @@ TESTS = \
 	generics/method-to-delegate-incompatible-3.test \
 	generics/multiple-classes-constraints.test \
 	generics/no-generic-args.vala \
+	generics/no-generic-args-invalid.test \
 	generics/no-generic-args-compact-class.vala \
 	generics/no-generic-args-function.vala \
 	generics/no-generic-args-use-with-proper-generic-type.test \
@@ -856,7 +857,6 @@ TESTS = \
 	generics/type-parameter-properties.vala \
 	generics/type-parameter-property-clash.vala \
 	generics/type-parameter-static-in-runtime.test \
-	generics/typeof-with-no-generic-args.test \
 	generics/value-pointer-type-access.vala \
 	generics/bug640330.vala \
 	generics/bug640330-2.test \
diff --git a/tests/generics/typeof-with-no-generic-args.test b/tests/generics/no-generic-args-invalid.test
similarity index 51%
rename from tests/generics/typeof-with-no-generic-args.test
rename to tests/generics/no-generic-args-invalid.test
index e2918af30..f33147b53 100644
--- a/tests/generics/typeof-with-no-generic-args.test
+++ b/tests/generics/no-generic-args-invalid.test
@@ -1,9 +1,11 @@
 Invalid Code
 
 [CCode (no_generic_args = true)]
-class Foo<G> : Object where G : Object {
-	public void bar () {
+class Foo<G> : Object {
+	public Foo () {
 		var g = typeof (G);
+		var dup = G.dup;
+		var destroy = G.destroy;
 	}
 }
 
diff --git a/tests/generics/no-generic-args.vala b/tests/generics/no-generic-args.vala
index 47d1088ce..93058f595 100644
--- a/tests/generics/no-generic-args.vala
+++ b/tests/generics/no-generic-args.vala
@@ -1,4 +1,3 @@
-
 [CCode (no_generic_args = true)]
 class Foo<G> : Object where G : Object {
 	public G bar { get; set; }
diff --git a/vala/valatypeofexpression.vala b/vala/valatypeofexpression.vala
index e1a0b0de7..2449b6086 100644
--- a/vala/valatypeofexpression.vala
+++ b/vala/valatypeofexpression.vala
@@ -90,11 +90,6 @@ public class Vala.TypeofExpression : Expression {
 			Report.warning (_data_type.source_reference, "Arrays do not have a `GLib.Type', with the exception of `string[]'");
 		}
 
-		if (type_reference.type_symbol is TypeParameter && ((TypeParameter) type_reference.type_symbol).no_generic_args) {
-			Report.error (_data_type.source_reference, "You cannot retrieve type parameters of types with the `[CCode (no_generic_args=true)]' attribute");
-			error = true;
-		}
-
 		return !error;
 	}