From b42c4b54a3589cffcab9dcce603c82728bcd82d0 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 13 Apr 2023 20:36:08 +0200 Subject: vala: Don't make GenericType nullable by default Allow equality between nullable and non-nullable generic-types for now Fixes https://gitlab.gnome.org/GNOME/vala/issues/1191 --- vala/valasymbolresolver.vala | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'vala/valasymbolresolver.vala') diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala index 87352bd00..d029aa9a7 100644 --- a/vala/valasymbolresolver.vala +++ b/vala/valasymbolresolver.vala @@ -473,16 +473,9 @@ public class Vala.SymbolResolver : CodeVisitor { type.source_reference = unresolved_type.source_reference; type.value_owned = unresolved_type.value_owned; + type.nullable = unresolved_type.nullable; sym.used = true; - if (type is GenericType) { - // type parameters are always considered nullable - // actual type argument may or may not be nullable - type.nullable = true; - } else { - type.nullable = unresolved_type.nullable; - } - type.is_dynamic = unresolved_type.is_dynamic; foreach (DataType type_arg in unresolved_type.get_type_arguments ()) { type.add_type_argument (type_arg); -- cgit v1.2.1