Revert "C#: Add output assembly to compilation"

tamasvajk · tamasvajk · commit 983c4d06d407 · 2021-01-13T09:12:31.000+01:00
This reverts commit 5cfa900.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilation.cs
@@ -21,9 +21,9 @@ public Compilation(Context cx, string cwd, string[] args) : base(cx)
 
         protected override void Populate(TextWriter trapFile)
         {
-            var assembly = Extraction.Entities.Assembly.CreateOutputAssembly(cx);
+            Extraction.Entities.Assembly.CreateOutputAssembly(cx);
 
-            trapFile.compilations(this, FileUtils.ConvertToUnix(cwd), assembly);
+            trapFile.compilations(this, FileUtils.ConvertToUnix(cwd));
 
             // Arguments
             var index = 0;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs b/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs
@@ -106,9 +106,9 @@ internal static void compilation_time(this TextWriter trapFile, Compilation comp
             trapFile.WriteTuple("compilation_time", compilation, num, index, metric);
         }
 
-        internal static void compilations(this TextWriter trapFile, Compilation compilation, string cwd, Assembly assembly)
+        internal static void compilations(this TextWriter trapFile, Compilation compilation, string cwd)
         {
-            trapFile.WriteTuple("compilations", compilation, cwd, assembly);
+            trapFile.WriteTuple("compilations", compilation, cwd);
         }
 
         internal static void compiler_generated(this TextWriter trapFile, IEntity entity)
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs
@@ -58,8 +58,7 @@ private class AssemblyConstructorFactory : ICachedEntityFactory<Microsoft.CodeAn
         }
 
         private static readonly object outputAssemblyCacheKey = new object();
-
-        public static Assembly CreateOutputAssembly(Context cx)
+        public static Location CreateOutputAssembly(Context cx)
         {
             if (cx.Extractor.OutputPath == null)
                 throw new InternalError("Attempting to create the output assembly in standalone extraction mode");
diff --git a/csharp/ql/src/semmle/code/csharp/Location.qll b/csharp/ql/src/semmle/code/csharp/Location.qll
@@ -14,7 +14,6 @@
 
 import File
 private import Attribute
-private import semmle.code.csharp.commons.Compilation
 
 /**
  * A location of a program element.
@@ -172,9 +171,6 @@ class Assembly extends Location, Attributable, @assembly {
   /** Gets the version of this assembly. */
   Version getVersion() { assemblies(this, _, _, _, result) }
 
-  /** Gets the compilation producing this assembly if any. */
-  Compilation getCompilation() { compilations(result, _, this) }
-
   override File getFile() { assemblies(this, result, _, _, _) }
 
   override string toString() { result = this.getFullName() }
diff --git a/csharp/ql/src/semmle/code/csharp/commons/Compilation.qll b/csharp/ql/src/semmle/code/csharp/commons/Compilation.qll
@@ -7,10 +7,7 @@ class Compilation extends @compilation {
   string toString() { result = "compilation" }
 
   /** Gets the directory in which this compilation was run, as a string. */
-  string getDirectoryString() { compilations(this, result, _) }
-
-  /** Gets the output assembly. */
-  Assembly getOutputAssembly() { compilations(this, _, result) }
+  string getDirectoryString() { compilations(this, result) }
 
   /** Gets the folder in which this compilation was run. */
   Folder getFolder() { result.getAbsolutePath() = getDirectoryString() }
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme b/csharp/ql/src/semmlecode.csharp.dbscheme
@@ -7,13 +7,11 @@
  *   csc f1.cs f2.cs f3.cs
  *
  * The `id` simply identifies the invocation, while `cwd` is the working
- * directory from which the compiler was invoked. The `assembly` identifies
- * the output assembly of the compilation.
+ * directory from which the compiler was invoked.
  */
 compilations(
     unique int id : @compilation,
-    string cwd : string ref,
-    int assembly: @assembly ref
+    string cwd : string ref
 );
 
 /**
diff --git a/csharp/ql/test/library-tests/assemblies/compilation.expected b/csharp/ql/test/library-tests/assemblies/compilation.expected
diff --git a/csharp/ql/test/library-tests/assemblies/compilation.ql b/csharp/ql/test/library-tests/assemblies/compilation.ql
diff --git a/csharp/ql/test/library-tests/compilations/Compilations.expected b/csharp/ql/test/library-tests/compilations/Compilations.expected
@@ -35,5 +35,3 @@ references
 | compilation | mscorlib.dll |
 timings
 | compilation |
-assembly
-| compilation | Program.dll:0:0:0:0 | Program, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
diff --git a/csharp/ql/test/library-tests/compilations/Compilations.ql b/csharp/ql/test/library-tests/compilations/Compilations.ql
@@ -39,5 +39,3 @@ query predicate timings(Compilation c) {
   c.getCpuSeconds() > 0 and
   c.getElapsedSeconds() > 0
 }
-
-query predicate assembly(Compilation c, Assembly a) { c.getOutputAssembly() = a }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public Compilation(Context cx, string cwd, string[] args) : base(cx)`
`21`	`21`
`22`	`22`	`protected override void Populate(TextWriter trapFile)`
`23`	`23`	`{`
`24`		`- var assembly = Extraction.Entities.Assembly.CreateOutputAssembly(cx);`
	`24`	`+ Extraction.Entities.Assembly.CreateOutputAssembly(cx);`
`25`	`25`
`26`		`- trapFile.compilations(this, FileUtils.ConvertToUnix(cwd), assembly);`
	`26`	`+ trapFile.compilations(this, FileUtils.ConvertToUnix(cwd));`
`27`	`27`
`28`	`28`	`// Arguments`
`29`	`29`	`var index = 0;`
Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,9 @@ internal static void compilation_time(this TextWriter trapFile, Compilation comp`
`106`	`106`	`trapFile.WriteTuple("compilation_time", compilation, num, index, metric);`
`107`	`107`	`}`
`108`	`108`
`109`		`- internal static void compilations(this TextWriter trapFile, Compilation compilation, string cwd, Assembly assembly)`
	`109`	`+ internal static void compilations(this TextWriter trapFile, Compilation compilation, string cwd)`
`110`	`110`	`{`
`111`		`- trapFile.WriteTuple("compilations", compilation, cwd, assembly);`
	`111`	`+ trapFile.WriteTuple("compilations", compilation, cwd);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`internal static void compiler_generated(this TextWriter trapFile, IEntity entity)`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ private class AssemblyConstructorFactory : ICachedEntityFactory<Microsoft.CodeAn`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private static readonly object outputAssemblyCacheKey = new object();`
`61`		`-`
`62`		`- public static Assembly CreateOutputAssembly(Context cx)`
	`61`	`+ public static Location CreateOutputAssembly(Context cx)`
`63`	`62`	`{`
`64`	`63`	`if (cx.Extractor.OutputPath == null)`
`65`	`64`	`throw new InternalError("Attempting to create the output assembly in standalone extraction mode");`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,3 @@ query predicate timings(Compilation c) {`
`39`	`39`	`c.getCpuSeconds() > 0 and`
`40`	`40`	`c.getElapsedSeconds() > 0`
`41`	`41`	`}`
`42`		`-`
`43`		`-query predicate assembly(Compilation c, Assembly a) { c.getOutputAssembly() = a }`