C#: Add unification tests for tuple types

Author: hvitved

csharp/ql/test/library-tests/unification/Unification.cs

@@ -21,4 +21,13 @@ class ConstructSomeTypes
     C6<C1<S1>, C2<S1>, C3<C2<S1>>, S1> f7;
 
     void M<Tm>(C6<C2<S2>, Tm, C3<Tm>, S2> x, C6<C2<S2>, C2<S2>, C3<C2<S2>>, S2> y) where Tm : C2<S2> { }
-}
+}
+
+class Tuples<T8, T9>
+{
+    static (T8, int) t1;
+    static (string, int) t2;
+    static (string, T9) t3;
+    static (T8, T9) t4;
+    static (T8 a, T9 b) t5 = t4;
+}

csharp/ql/test/library-tests/unification/Unification.expected

@@ -3,6 +3,11 @@ constrainedTypeParameterSubsumes
 | Unification.cs:7:10:7:11 | T2 | Unification.cs:3:22:3:23 | S2 |
 | Unification.cs:7:10:7:11 | T2 | Unification.cs:7:10:7:11 | T2 |
 | Unification.cs:7:10:7:11 | T2 | Unification.cs:11:25:11:27 | T6d |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:28:12:28:20 | (T8,Int32) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:29:12:29:24 | (String,Int32) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:30:12:30:23 | (String,T9) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:31:12:31:19 | (T8,T9) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:32:12:32:23 | (T8,T9) |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:1:11:1:12 | I1 |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:5:7:5:8 | C0 |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:6:7:6:12 | C1<> |
@@ -36,6 +41,7 @@ constrainedTypeParameterSubsumes
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:11:20:11:22 | T6c |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:13:7:13:24 | ConstructSomeTypes |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:23:12:23:13 | Tm |
+| Unification.cs:8:10:8:11 | T3 | Unification.cs:26:7:26:20 | Tuples<,> |
 | Unification.cs:9:10:9:11 | T4 | Unification.cs:6:7:6:12 | C1<C0> |
 | Unification.cs:9:10:9:11 | T4 | Unification.cs:9:10:9:11 | T4 |
 | Unification.cs:10:10:10:11 | T5 | Unification.cs:7:7:7:12 | C2<S1> |
@@ -71,6 +77,11 @@ constrainedTypeParameterSubsumes
 | Unification.cs:11:25:11:27 | T6d | Unification.cs:3:22:3:23 | S2 |
 | Unification.cs:11:25:11:27 | T6d | Unification.cs:7:10:7:11 | T2 |
 | Unification.cs:11:25:11:27 | T6d | Unification.cs:11:25:11:27 | T6d |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:28:12:28:20 | (T8,Int32) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:29:12:29:24 | (String,Int32) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:30:12:30:23 | (String,T9) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:31:12:31:19 | (T8,T9) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:32:12:32:23 | (T8,T9) |
 | Unification.cs:23:12:23:13 | Tm | Unification.cs:7:7:7:12 | C2<S2> |
 | Unification.cs:23:12:23:13 | Tm | Unification.cs:23:12:23:13 | Tm |
 constrainedTypeParameterSubsumptionImpliesUnification
@@ -79,6 +90,11 @@ constrainedTypeParameterUnifiable
 | Unification.cs:7:10:7:11 | T2 | Unification.cs:3:22:3:23 | S2 |
 | Unification.cs:7:10:7:11 | T2 | Unification.cs:7:10:7:11 | T2 |
 | Unification.cs:7:10:7:11 | T2 | Unification.cs:11:25:11:27 | T6d |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:28:12:28:20 | (T8,Int32) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:29:12:29:24 | (String,Int32) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:30:12:30:23 | (String,T9) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:31:12:31:19 | (T8,T9) |
+| Unification.cs:7:10:7:11 | T2 | Unification.cs:32:12:32:23 | (T8,T9) |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:1:11:1:12 | I1 |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:5:7:5:8 | C0 |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:6:7:6:12 | C1<> |
@@ -112,6 +128,7 @@ constrainedTypeParameterUnifiable
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:11:20:11:22 | T6c |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:13:7:13:24 | ConstructSomeTypes |
 | Unification.cs:8:10:8:11 | T3 | Unification.cs:23:12:23:13 | Tm |
+| Unification.cs:8:10:8:11 | T3 | Unification.cs:26:7:26:20 | Tuples<,> |
 | Unification.cs:9:10:9:11 | T4 | Unification.cs:6:7:6:12 | C1<> |
 | Unification.cs:9:10:9:11 | T4 | Unification.cs:6:7:6:12 | C1<C0> |
 | Unification.cs:9:10:9:11 | T4 | Unification.cs:6:7:6:12 | C1<T2> |
@@ -155,6 +172,11 @@ constrainedTypeParameterUnifiable
 | Unification.cs:11:25:11:27 | T6d | Unification.cs:3:22:3:23 | S2 |
 | Unification.cs:11:25:11:27 | T6d | Unification.cs:7:10:7:11 | T2 |
 | Unification.cs:11:25:11:27 | T6d | Unification.cs:11:25:11:27 | T6d |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:28:12:28:20 | (T8,Int32) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:29:12:29:24 | (String,Int32) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:30:12:30:23 | (String,T9) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:31:12:31:19 | (T8,T9) |
+| Unification.cs:11:25:11:27 | T6d | Unification.cs:32:12:32:23 | (T8,T9) |
 | Unification.cs:23:12:23:13 | Tm | Unification.cs:7:7:7:12 | C2<> |
 | Unification.cs:23:12:23:13 | Tm | Unification.cs:7:7:7:12 | C2<S2> |
 | Unification.cs:23:12:23:13 | Tm | Unification.cs:23:12:23:13 | Tm |
@@ -220,6 +242,7 @@ subsumes
 | Unification.cs:11:7:11:28 | C6<C2<S2>,C2<S2>,C3<C2<S2>>,S2> | Unification.cs:11:7:11:28 | C6<C2<S2>,C2<S2>,C3<C2<S2>>,S2> |
 | Unification.cs:11:7:11:28 | C6<C2<S2>,Tm,C3<Tm>,S2> | Unification.cs:11:7:11:28 | C6<C2<S2>,C2<S2>,C3<C2<S2>>,S2> |
 | Unification.cs:11:7:11:28 | C6<C2<S2>,Tm,C3<Tm>,S2> | Unification.cs:11:7:11:28 | C6<C2<S2>,Tm,C3<Tm>,S2> |
+| Unification.cs:26:7:26:20 | Tuples<,> | Unification.cs:26:7:26:20 | Tuples<,> |
 subsumptionImpliesUnification
 unifiable
 | Unification.cs:6:7:6:12 | C1<C0> | Unification.cs:6:7:6:12 | C1<> |

csharp/ql/test/library-tests/unification/Unification.ql

@@ -3,7 +3,7 @@ import semmle.code.csharp.Unification
 class InterestingType extends Type {
   InterestingType() {
     this.fromSource() or
-    this.getAChild() instanceof InterestingType
+    this.(TupleType).getAChild() instanceof InterestingType
   }
 }