hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1055 from calumgrant/cs/lazy-type-mention

Browse Source 
C#: Fix an InvalidOperationException in csharp.log
This commit is contained in:
Tom Hvitved
2019-03-08 14:17:51 +01:00
committed by GitHub
parent 300e3bdfec fe4cdfdae0
commit 77185f1fa3
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
View File

@@ -53,7 +53,7 @@ namespace Semmle.Extraction.CSharp.Entities
case SyntaxKind.GenericName:
var gns = (GenericNameSyntax)Syntax;
Emit(Loc ?? gns.Identifier.GetLocation(), Parent, Type);
gns.TypeArgumentList.Arguments.Zip(Type.TypeMentions, (s, t) => Create(cx, s, this, t)).Enumerate();
cx.PopulateLater(() => gns.TypeArgumentList.Arguments.Zip(Type.TypeMentions, (s, t) => Create(cx, s, this, t)).Enumerate());
return;
case SyntaxKind.QualifiedName:
if (Type.ContainingType == null)

12
csharp/ql/test/library-tests/regressions/Program.cs
View File

@@ -147,4 +147,16 @@ partial class C1<T> where T: DynamicType
{
}
namespace NoPia
{
class EmbeddedTypesManager<
TEmbeddedTypesManager,
TEmbeddedType
>
where TEmbeddedTypesManager : EmbeddedTypesManager<TEmbeddedTypesManager, TEmbeddedType>
where TEmbeddedType : EmbeddedTypesManager<TEmbeddedTypesManager, TEmbeddedType>
{
}
}
// semmle-extractor-options: /r:System.Dynamic.Runtime.dll

8
csharp/ql/test/library-tests/regressions/TypeMentions.expected
View File

@@ -68,3 +68,11 @@
| Program.cs:142:30:142:40 | DynamicType |
| Program.cs:146:27:146:27 | T |
| Program.cs:146:30:146:40 | DynamicType |
| Program.cs:156:15:156:35 | TEmbeddedTypesManager |
| Program.cs:156:39:156:58 | EmbeddedTypesManager<,> |
| Program.cs:156:60:156:80 | TEmbeddedTypesManager |
| Program.cs:156:83:156:95 | TEmbeddedType |
| Program.cs:157:15:157:27 | TEmbeddedType |
| Program.cs:157:31:157:50 | EmbeddedTypesManager<,> |
| Program.cs:157:52:157:72 | TEmbeddedTypesManager |
| Program.cs:157:75:157:87 | TEmbeddedType |