Always populate assemblies

tamasvajk · tamasvajk · commit 7418c0559454 · 2021-01-13T09:10:49.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs
@@ -232,7 +232,7 @@ private void DoAnalyseCompilation(string cwd, string[] args)
                 var projectLayout = layout.LookupProjectOrDefault(transformedAssemblyPath);
                 var trapWriter = projectLayout.CreateTrapWriter(Logger, transformedAssemblyPath, options.TrapCompression, discardDuplicates: false);
                 compilationTrapFile = trapWriter;  // Dispose later
-                var cx = extractor.CreateContext(compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath, true), AddAssemblyTrapPrefix);
+                var cx = extractor.CreateContext(compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);
 
                 compilationEntity = new Entities.Compilation(cx, cwd, args);
             }
@@ -287,7 +287,7 @@ private void DoAnalyseReferenceAssembly(PortableExecutableReference r)
 
                     if (c.GetAssemblyOrModuleSymbol(r) is IAssemblySymbol assembly)
                     {
-                        var cx = extractor.CreateContext(c, trapWriter, new AssemblyScope(assembly, assemblyPath, false), AddAssemblyTrapPrefix);
+                        var cx = extractor.CreateContext(c, trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);
 
                         foreach (var module in assembly.Modules)
                         {
diff --git a/csharp/extractor/Semmle.Extraction/AssemblyScope.cs b/csharp/extractor/Semmle.Extraction/AssemblyScope.cs
@@ -10,15 +10,12 @@ public class AssemblyScope : IExtractionScope
         private readonly IAssemblySymbol assembly;
         private readonly string filepath;
 
-        public AssemblyScope(IAssemblySymbol symbol, string path, bool isOutput)
+        public AssemblyScope(IAssemblySymbol symbol, string path)
         {
             assembly = symbol;
             filepath = path;
-            IsGlobalScope = isOutput;
         }
 
-        public bool IsGlobalScope { get; }
-
         public bool InFileScope(string path) => path == filepath;
 
         public bool InScope(ISymbol symbol) =>
diff --git a/csharp/extractor/Semmle.Extraction/Context.cs b/csharp/extractor/Semmle.Extraction/Context.cs
@@ -244,8 +244,6 @@ public Context(IExtractor e, Compilation c, TrapWriter trapWriter, IExtractionSc
 
         public bool FromSource => scope.FromSource;
 
-        public bool IsGlobalContext => scope.IsGlobalScope;
-
         public ICommentGenerator CommentGenerator { get; } = new CommentProcessor();
 
         private IExtractionScope scope { get; }
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs
@@ -35,8 +35,7 @@ public override void Populate(TextWriter trapFile)
             }
         }
 
-        public override bool NeedsPopulation =>
-            !SymbolEqualityComparer.Default.Equals(assembly, Context.Compilation.Assembly) || !Context.IsGlobalContext;
+        public override bool NeedsPopulation => true;
 
         public override int GetHashCode() =>
             symbol == null ? 91187354 : symbol.GetHashCode();
diff --git a/csharp/extractor/Semmle.Extraction/IExtractionScope.cs b/csharp/extractor/Semmle.Extraction/IExtractionScope.cs
@@ -23,8 +23,6 @@ public interface IExtractionScope
         /// <param name="path">The path to populate.</param>
         bool InFileScope(string path);
 
-        bool IsGlobalScope { get; }
-
         bool FromSource { get; }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction/SourceScope.cs b/csharp/extractor/Semmle.Extraction/SourceScope.cs
@@ -16,8 +16,6 @@ public SourceScope(SyntaxTree tree)
             SourceTree = tree;
         }
 
-        public bool IsGlobalScope => false;
-
         public bool InFileScope(string path) => path == SourceTree.FilePath;
 
         public bool InScope(ISymbol symbol) => symbol.Locations.Any(loc => loc.SourceTree == SourceTree);

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ private void DoAnalyseCompilation(string cwd, string[] args)`
`232`	`232`	`var projectLayout = layout.LookupProjectOrDefault(transformedAssemblyPath);`
`233`	`233`	`var trapWriter = projectLayout.CreateTrapWriter(Logger, transformedAssemblyPath, options.TrapCompression, discardDuplicates: false);`
`234`	`234`	`compilationTrapFile = trapWriter; // Dispose later`
`235`		`- var cx = extractor.CreateContext(compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath, true), AddAssemblyTrapPrefix);`
	`235`	`+ var cx = extractor.CreateContext(compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);`
`236`	`236`
`237`	`237`	`compilationEntity = new Entities.Compilation(cx, cwd, args);`
`238`	`238`	`}`
`@@ -287,7 +287,7 @@ private void DoAnalyseReferenceAssembly(PortableExecutableReference r)`
`287`	`287`
`288`	`288`	`if (c.GetAssemblyOrModuleSymbol(r) is IAssemblySymbol assembly)`
`289`	`289`	`{`
`290`		`- var cx = extractor.CreateContext(c, trapWriter, new AssemblyScope(assembly, assemblyPath, false), AddAssemblyTrapPrefix);`
	`290`	`+ var cx = extractor.CreateContext(c, trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);`
`291`	`291`
`292`	`292`	`foreach (var module in assembly.Modules)`
`293`	`293`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,12 @@ public class AssemblyScope : IExtractionScope`
`10`	`10`	`private readonly IAssemblySymbol assembly;`
`11`	`11`	`private readonly string filepath;`
`12`	`12`
`13`		`- public AssemblyScope(IAssemblySymbol symbol, string path, bool isOutput)`
	`13`	`+ public AssemblyScope(IAssemblySymbol symbol, string path)`
`14`	`14`	`{`
`15`	`15`	`assembly = symbol;`
`16`	`16`	`filepath = path;`
`17`		`- IsGlobalScope = isOutput;`
`18`	`17`	`}`
`19`	`18`
`20`		`- public bool IsGlobalScope { get; }`
`21`		`-`
`22`	`19`	`public bool InFileScope(string path) => path == filepath;`
`23`	`20`
`24`	`21`	`public bool InScope(ISymbol symbol) =>`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ public override void Populate(TextWriter trapFile)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- public override bool NeedsPopulation =>`
`39`		`- !SymbolEqualityComparer.Default.Equals(assembly, Context.Compilation.Assembly) \|\| !Context.IsGlobalContext;`
	`38`	`+ public override bool NeedsPopulation => true;`
`40`	`39`
`41`	`40`	`public override int GetHashCode() =>`
`42`	`41`	`symbol == null ? 91187354 : symbol.GetHashCode();`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ public interface IExtractionScope`
`23`	`23`	`/// <param name="path">The path to populate.</param>`
`24`	`24`	`bool InFileScope(string path);`
`25`	`25`
`26`		`- bool IsGlobalScope { get; }`
`27`		`-`
`28`	`26`	`bool FromSource { get; }`
`29`	`27`	`}`
`30`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public SourceScope(SyntaxTree tree)`
`16`	`16`	`SourceTree = tree;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public bool IsGlobalScope => false;`
`20`		`-`
`21`	`19`	`public bool InFileScope(string path) => path == SourceTree.FilePath;`
`22`	`20`
`23`	`21`	`public bool InScope(ISymbol symbol) => symbol.Locations.Any(loc => loc.SourceTree == SourceTree);`