From: Rico Tzschichholz Date: Tue, 31 May 2022 08:19:46 +0000 (+0200) Subject: codegen: Detect usage of static type-parameter in runtime context X-Git-Tag: 0.56.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46ef198a5de5e6abb0322da2e7b92cd8541c9377;p=thirdparty%2Fvala.git codegen: Detect usage of static type-parameter in runtime context Compact classes doesn't carry runtime information of its type-parameters. In case this information is required we need report an error. Fixes https://gitlab.gnome.org/GNOME/vala/issues/1326 --- diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala index 50dbbea8f..121344373 100644 --- a/codegen/valaccodebasemodule.vala +++ b/codegen/valaccodebasemodule.vala @@ -3048,6 +3048,11 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator { public CCodeExpression get_type_id_expression (DataType type, bool is_chainup = false) { if (type is GenericType) { var type_parameter = ((GenericType) type).type_parameter; + unowned Symbol? parent = type_parameter.owner.owner; + if (parent is Class && ((Class) parent).is_compact) { + Report.error (type.source_reference, "static type-parameter `%s' can not be used in runtime context", type.type_symbol.get_full_name ()); + return new CCodeInvalidExpression(); + } string identifier = get_ccode_type_id (type_parameter); return get_generic_type_expression (identifier, (GenericType) type, is_chainup); } else { diff --git a/tests/Makefile.am b/tests/Makefile.am index 0d0fca034..3dd2cad45 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -790,6 +790,7 @@ TESTS = \ generics/string-literal-comparison.vala \ generics/type-parameter-properties.vala \ generics/type-parameter-property-clash.vala \ + generics/type-parameter-static-in-runtime.test \ generics/value-pointer-type-access.vala \ generics/bug640330.vala \ generics/bug640330-2.test \ diff --git a/tests/generics/type-parameter-static-in-runtime.test b/tests/generics/type-parameter-static-in-runtime.test new file mode 100644 index 000000000..f6b6317fe --- /dev/null +++ b/tests/generics/type-parameter-static-in-runtime.test @@ -0,0 +1,14 @@ +Invalid Code + +[Compact] +class Foo { + public Bar bar () { + return new Bar (); + } +} + +class Bar { +} + +void main () { +}