hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Compare CIL entities directly by handle rather than by label.

Browse Source 
C#: Remove IDs from the CIL extractor and make consistent with C# extractor.
C#: Fix method collisions.
This commit is contained in:
Calum Grant
2019-08-13 18:50:25 +01:00
parent 685c494bcb
commit b500a02b1e
34 changed files with 878 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/extractor/Semmle.Extraction/CommentProcessing.cs
View File

@@ -332,7 +332,7 @@ namespace Semmle.Extraction.CommentProcessing
class CommentBlock : ICommentBlock
{
private List<ICommentLine> lines = new List<ICommentLine>();
private readonly List<ICommentLine> lines = new List<ICommentLine>();
public IEnumerable<ICommentLine> CommentLines => lines;

16
csharp/extractor/Semmle.Extraction/Context.cs
View File

@@ -105,9 +105,11 @@ namespace Semmle.Extraction
if (entity.NeedsPopulation)
Populate(init as ISymbol, entity);
#if DEBUG_LABELS
var id = new StringWriter();
entity.WriteId(id);
CheckEntityHasUniqueLabel(id.ToString(), entity);
using (var id = new StringWriter())
{
entity.WriteId(id);
CheckEntityHasUniqueLabel(id.ToString(), entity);
}
#endif
}
@@ -149,9 +151,11 @@ namespace Semmle.Extraction
Populate(init as ISymbol, entity);
#if DEBUG_LABELS
var id = new StringWriter();
entity.WriteId(id);
CheckEntityHasUniqueLabel(id.ToString(), entity);
using (var id = new StringWriter())
{
entity.WriteId(id);
CheckEntityHasUniqueLabel(id.ToString(), entity);
}
#endif
return entity;

2
csharp/extractor/Semmle.Extraction/Entities/Assembly.cs
View File

@@ -69,7 +69,7 @@ namespace Semmle.Extraction.Entities
public override void WriteId(System.IO.TextWriter trapFile)
{
trapFile.Write(assembly.ToString());
if (assemblyPath is null)
if (!(assemblyPath is null))
{
trapFile.Write("#file:///");
trapFile.Write(assemblyPath.Replace("\\", "/"));

12
csharp/extractor/Semmle.Extraction/Entity.cs
View File

@@ -162,11 +162,13 @@ namespace Semmle.Extraction
/// <returns>The debug string.</returns>
public static string GetDebugLabel(this IEntity entity)
{
var writer = new StringWriter();
writer.WriteLabel(entity.Label.Value);
writer.Write('=');
entity.WriteQuotedId(writer);
return writer.ToString();
using (var writer = new StringWriter())
{
writer.WriteLabel(entity.Label.Value);
writer.Write('=');
entity.WriteQuotedId(writer);
return writer.ToString();
}
}
}

2
csharp/extractor/Semmle.Extraction/Id.cs
View File

@@ -106,7 +106,7 @@ namespace Semmle.Extraction
class IdTrapBuilder
{
readonly public List<string> Fragments = new List<string>();
public readonly List<string> Fragments = new List<string>();
public void Append(object arg)
{

3
csharp/extractor/Semmle.Extraction/Options.cs
View File

@@ -90,6 +90,9 @@ namespace Semmle.Extraction
CIL = !value;
Fast = value;
return true;
case "brotli":
TrapCompression = value ? TrapWriter.CompressionMode.Brotli : TrapWriter.CompressionMode.Gzip;
return true;
default:
return false;
}

8
csharp/extractor/Semmle.Extraction/Symbol.cs
View File

@@ -26,9 +26,11 @@ namespace Semmle.Extraction
{
get
{
var trap = new StringWriter();
Populate(trap);
return trap.ToString();
using (var trap = new StringWriter())
{
Populate(trap);
return trap.ToString();
}
}
}

6
csharp/extractor/Semmle.Extraction/TrapExtensions.cs
View File

@@ -48,6 +48,12 @@ namespace Semmle.Extraction
return new NextParam(Writer);
}
public NextParam Param(Label label)
{
Writer.WriteLabel(label.Value);
return new NextParam(Writer);
}
public void EndTuple()
{
Writer.WriteLine(')');

8
csharp/extractor/Semmle.Extraction/Tuple.cs
View File

@@ -155,9 +155,11 @@ namespace Semmle.Extraction
public override string ToString()
{
// Only implemented for debugging purposes
var tsb = new StringWriter();
EmitToTrapBuilder(tsb);
return tsb.ToString();
using (var writer = new StringWriter())
{
EmitToTrapBuilder(writer);
return writer.ToString();
}
}
}
}