Merge pull request #14937 from hvitved/csharp/stubvisitor-recursion-guard

hvitved · web-flow · commit e79ad3b73850 · 2023-11-28T16:25:52.000+01:00
C#: Prevent infinite recursion in `EqualsModuloTupleElementNames`
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/StubVisitor.cs b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/StubVisitor.cs
@@ -41,6 +41,7 @@ static bool EqualsModuloTupleElementNames(ITypeSymbol t1, ITypeSymbol t2) =>
             (
                 t1 is INamedTypeSymbol named1 &&
                 t2 is INamedTypeSymbol named2 &&
+                (!SymbolEqualityComparer.Default.Equals(named1, named1.ConstructedFrom) || !SymbolEqualityComparer.Default.Equals(named2, named2.ConstructedFrom)) &&
                 EqualsModuloTupleElementNames(named1.ConstructedFrom, named2.ConstructedFrom) &&
                 named1.TypeArguments.Length == named2.TypeArguments.Length &&
                 named1.TypeArguments.Zip(named2.TypeArguments).All(p => EqualsModuloTupleElementNames(p.First, p.Second))

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ static bool EqualsModuloTupleElementNames(ITypeSymbol t1, ITypeSymbol t2) =>`
`41`	`41`	`(`
`42`	`42`	`t1 is INamedTypeSymbol named1 &&`
`43`	`43`	`t2 is INamedTypeSymbol named2 &&`
	`44`	`+ (!SymbolEqualityComparer.Default.Equals(named1, named1.ConstructedFrom) \|\| !SymbolEqualityComparer.Default.Equals(named2, named2.ConstructedFrom)) &&`
`44`	`45`	`EqualsModuloTupleElementNames(named1.ConstructedFrom, named2.ConstructedFrom) &&`
`45`	`46`	`named1.TypeArguments.Length == named2.TypeArguments.Length &&`
`46`	`47`	`named1.TypeArguments.Zip(named2.TypeArguments).All(p => EqualsModuloTupleElementNames(p.First, p.Second))`