Merge pull request #14436 from tamasvajk/void-type-value-type

C#: Include the `void` type in value types
github · Oct 11, 2023 · a31f946 · a31f946
2 parents 7780fe9 + 267fd23
commit a31f946
Show file tree

Hide file tree

Showing 8 changed files with 8,314 additions and 2 deletions.
diff --git a/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/old.dbscheme b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/old.dbscheme
diff --git a/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/semmlecode.csharp.dbscheme b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/semmlecode.csharp.dbscheme
diff --git a/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/upgrade.properties b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/upgrade.properties
@@ -0,0 +1,2 @@
+description: Exclude @void_type from @value_type
+compatibility: full
diff --git a/csharp/ql/lib/semmle/code/csharp/Type.qll b/csharp/ql/lib/semmle/code/csharp/Type.qll
@@ -397,7 +397,7 @@ class NonNestedType extends ValueOrRefType {
 /**
  * The `void` type.
  */
-class VoidType extends DotNet::ValueOrRefType, Type, @void_type {
+class VoidType extends ValueOrRefType, @void_type {
   override predicate hasQualifiedName(string qualifier, string name) {
     qualifier = "System" and
     name = "Void"

diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme b/csharp/ql/lib/semmlecode.csharp.dbscheme
@@ -456,7 +456,7 @@ case @type.kind of
 @unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
 @floating_point_type = @float_type | @double_type;
 @value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
-            | @uint_ptr_type | @tuple_type;
+            | @uint_ptr_type | @tuple_type | @void_type;
 @ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
           | @dynamic_type;
 @value_or_ref_type = @value_type | @ref_type;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		description: Exclude @void_type from @value_type
		compatibility: full