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

C#: Fix namespace extraction of NoMetadataHandleType

Browse Source
This commit is contained in:
Tamas Vajk
2021-01-18 14:18:23 +01:00
parent 1b285ee792
commit d05d4e22ad
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
csharp/extractor/Semmle.Extraction.CIL/Entities/NoMetadataHandleType.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using Semmle.Util;
namespace Semmle.Extraction.CIL.Entities
{
@@ -21,6 +20,7 @@ namespace Semmle.Extraction.CIL.Entities
private readonly Type[]? thisTypeArguments;
private readonly Type unboundGenericType;
private readonly Type? containingType;
private readonly Namespace? containingNamespace;
private readonly NamedTypeIdWriter idWriter;
@@ -53,13 +53,20 @@ namespace Semmle.Extraction.CIL.Entities
? null
: new NoMetadataHandleType(Cx, containerName);
containingNamespace = isContainerNamespace
? containerName == Cx.GlobalNamespace.Name
? Cx.GlobalNamespace
: containerName == Cx.SystemNamespace.Name
? Cx.SystemNamespace
: new Namespace(Cx, containerName)
: null;
Populate();
}
private void Populate()
{
if (isContainerNamespace &&
!ContainingNamespace!.IsGlobalNamespace)
if (isContainerNamespace)
{
Cx.Populate(ContainingNamespace);
}
@@ -100,11 +107,7 @@ namespace Semmle.Extraction.CIL.Entities
public override string Name => GenericsHelper.GetNonGenericName(name);
public override Namespace? ContainingNamespace => isContainerNamespace
? containerName == Cx.GlobalNamespace.Name
? Cx.GlobalNamespace
: new Namespace(Cx, containerName)
: null;
public override Namespace? ContainingNamespace => containingNamespace;
public override Type? ContainingType => containingType;