Remove the upcast in InheritanceHelper.GetBaseMembers()

erik-kallen · Dec 12, 2013 · 72e152d · 72e152d
1 parent 137027c
commit 72e152d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/CSharpOperators.cs b/ICSharpCode.NRefactory.CSharp/Resolver/CSharpOperators.cs
@@ -241,6 +241,8 @@ TypeParameterSubstitution IMember.Substitution {
 
 			IMember IMember.Specialize(TypeParameterSubstitution substitution)
 			{
+				if (TypeParameterSubstitution.Identity.Equals(substitution))
+					return this;
 				throw new NotSupportedException();
 			}
 

diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedEvent.cs b/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedEvent.cs
@@ -61,6 +61,8 @@ public IMethod InvokeAccessor {
 
 		public override IMember Specialize(TypeParameterSubstitution substitution)
 		{
+			if (TypeParameterSubstitution.Identity.Equals(substitution))
+				return this;
 			return new SpecializedEvent(this, substitution);
 		}
 	}

diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedField.cs b/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedField.cs
@@ -74,6 +74,8 @@ public object ConstantValue {
 
 		public override IMember Specialize(TypeParameterSubstitution substitution)
 		{
+			if (TypeParameterSubstitution.Identity.Equals(substitution))
+				return this;
 			return new SpecializedField(this, substitution);
 		}
 	}

diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedMethod.cs b/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedMethod.cs
@@ -248,11 +248,15 @@ public override IMemberReference ToMemberReference()
 
 		public override IMember Specialize(TypeParameterSubstitution substitution)
 		{
+			if (TypeParameterSubstitution.Identity.Equals(substitution))
+				return this;
 			return new SpecializedMethod(this, substitution);
 		}
 
 		IMethod IMethod.Specialize(TypeParameterSubstitution substitution)
 		{
+			if (TypeParameterSubstitution.Identity.Equals(substitution))
+				return this;
 			return new SpecializedMethod(this, substitution);
 		}
 

diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedProperty.cs b/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedProperty.cs
@@ -75,6 +75,8 @@ public override IMemberReference ToMemberReference()
 
 		public override IMember Specialize(TypeParameterSubstitution substitution)
 		{
+			if (TypeParameterSubstitution.Identity.Equals(substitution))
+				return this;
 			return new SpecializedProperty(this, substitution);
 		}
 	}

diff --git a/ICSharpCode.NRefactory/TypeSystem/InheritanceHelper.cs b/ICSharpCode.NRefactory/TypeSystem/InheritanceHelper.cs
@@ -57,8 +57,8 @@ public static IEnumerable<IMember> GetBaseMembers(IMember member, bool includeIm
 				yield return member;
 			}
 
-			// TODO: can we get rid of this upcast?
-			SpecializedMember specializedMember = member as SpecializedMember;
+			// Remove generic specialization
+			var substitution = member.Substitution;
 			member = member.MemberDefinition;
 
 			IEnumerable<IType> allBaseTypes;
@@ -79,10 +79,7 @@ public static IEnumerable<IMember> GetBaseMembers(IMember member, bool includeIm
 				}
 				foreach (IMember baseMember in baseMembers) {
 					if (SignatureComparer.Ordinal.Equals(member, baseMember)) {
-						if (specializedMember != null)
-							yield return baseMember.Specialize(specializedMember.Substitution);
-						else
-							yield return baseMember;
+						yield return baseMember.Specialize(substitution);
 					}
 				}
 			}