Fix references to nested types in generic classes.

icsharpcode · Aug 11, 2019 · cdc7a36 · cdc7a36
1 parent c151002
commit cdc7a36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullableRefTypes.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullableRefTypes.cs
@@ -83,4 +83,17 @@ public string Property {
 		}
 		public event EventHandler Event;
 	}
+
+	public class T04_Dictionary<TKey, TValue> where TKey : notnull
+	{
+		private struct Entry
+		{
+			public TKey key;
+			public TValue value;
+		}
+
+		private int[]? _buckets;
+		private Entry[]? _entries;
+		private IEqualityComparer<TKey>? _comparer;
+	}
 }
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractTypeParameter.cs
@@ -194,11 +194,11 @@ public bool? IsReferenceType {
 		}
 
 		bool IType.IsByRefLike => false;
-		Nullability IType.Nullability => NullabilityConstraint;
+		Nullability IType.Nullability => Nullability.Oblivious;
 
 		public IType ChangeNullability(Nullability nullability)
 		{
-			if (nullability == NullabilityConstraint)
+			if (nullability == Nullability.Oblivious)
 				return this;
 			else
 				return new NullabilityAnnotatedTypeParameter(this, nullability);