Avoid .OriginalDefinition for comparing class types.

dotnet · Nov 28, 2024 · f2eea04 · f2eea04
1 parent 41ef580
commit f2eea04
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...NetCore.Analyzers/Runtime/DoNotCallEnumerableCastOrOfTypeWithIncompatibleTypesAnalyzer.cs b/...NetCore.Analyzers/Runtime/DoNotCallEnumerableCastOrOfTypeWithIncompatibleTypesAnalyzer.cs
@@ -196,6 +196,10 @@ static bool CastWillAlwaysFail(ITypeSymbol castFrom, ITypeSymbol castTo)
                     return false;
                 }
 
+                // Most checks are better with OriginalDefinition, but keep the ones passed in around.
+                ITypeSymbol castFromParam = castFrom;
+                ITypeSymbol castToParam = castTo;
+
                 castFrom = castFrom.OriginalDefinition;
                 castTo = castTo.OriginalDefinition;
 
@@ -269,8 +273,8 @@ static bool IsUnconstrainedTypeParameter(ITypeParameterSymbol typeParameterSymbo
                         return false;
 
                     case (TypeKind.Class, TypeKind.Class):
-                        return !castFrom.DerivesFrom(castTo)
-                            && !castTo.DerivesFrom(castFrom);
+                        return !castFromParam.DerivesFrom(castToParam)
+                            && !castToParam.DerivesFrom(castFromParam);
 
                     case (TypeKind.Interface, TypeKind.Class):
                         return castTo.IsSealed && !castTo.DerivesFrom(castFrom);