C#: Fix up tests. Fix cil_class, and add locations for constructed methods and types.

calumgrant · calumgrant · commit b7764216029e · 2019-08-30T10:11:01.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs
@@ -57,11 +57,6 @@ protected TypeContainer(Context cx) : base(cx)
 
         public abstract void WriteId(TextWriter trapFile);
 
-        /// <summary>
-        /// For debugging purposes.
-        /// </summary>
-        string DebugId => this.GetDebugLabel();
-
         public void WriteQuotedId(TextWriter trapFile)
         {
             trapFile.Write("@\"");
@@ -508,11 +503,10 @@ public override IEnumerable<IExtractionProduct> Contents
                 if (td.Attributes.HasFlag(TypeAttributes.Abstract))
                     yield return Tuples.cil_abstract(this);
 
-                if (td.Attributes.HasFlag(TypeAttributes.Class))
-                    yield return Tuples.cil_class(this);
-
                 if (td.Attributes.HasFlag(TypeAttributes.Interface))
                     yield return Tuples.cil_interface(this);
+                else
+                    yield return Tuples.cil_class(this);
 
                 if (td.Attributes.HasFlag(TypeAttributes.Public))
                     yield return Tuples.cil_public(this);
diff --git a/csharp/ql/src/semmle/code/cil/ConsistencyChecks.qll b/csharp/ql/src/semmle/code/cil/ConsistencyChecks.qll
@@ -444,7 +444,8 @@ class InvalidOverride extends MethodViolation {
 
   InvalidOverride() {
     base = getMethod().getOverriddenMethod() and
-    not getMethod().getDeclaringType().getABaseType+() = base.getDeclaringType()
+    not getMethod().getDeclaringType().getABaseType+() = base.getDeclaringType() and
+    base.getDeclaringType().isSourceDeclaration() // Bases classes of constructed types aren't extracted properly.
   }
 
   override string getMessage() {
diff --git a/csharp/ql/src/semmle/code/cil/Generics.qll b/csharp/ql/src/semmle/code/cil/Generics.qll
@@ -40,6 +40,4 @@ class ConstructedType extends ConstructedGeneric, Type { }
 /** A constructed generic method. */
 class ConstructedMethod extends ConstructedGeneric, Method {
   final override UnboundGenericMethod getUnboundGeneric() { result = getUnboundMethod() }
-
-  final override Location getLocation() { result = getUnboundGeneric().getLocation() }
 }
diff --git a/csharp/ql/src/semmle/code/cil/Method.qll b/csharp/ql/src/semmle/code/cil/Method.qll
@@ -85,13 +85,11 @@ class Method extends DotNet::Callable, Element, Member, TypeContainer, DataFlowN
 
   override Location getLocation() { result = Element.super.getLocation() }
 
-  /**
-   * Gets a location of this method, if any.
-   *
-   * This predicate returns locations both in assemblies and in source code
-   * if available.
-   */
-  override Location getALocation() { cil_method_location(this, result) }
+  override Location getALocation() {
+    cil_method_location(this, result)
+    or
+    result = this.getSourceDeclaration().getALocation()
+  }
 
   override Parameter getRawParameter(int n) { cil_parameter(result, this, n, _) }
 
diff --git a/csharp/ql/src/semmle/code/cil/Type.qll b/csharp/ql/src/semmle/code/cil/Type.qll
@@ -57,10 +57,10 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {
     qualifier = this.getParent().getQualifiedName()
   }
 
-  override Location getLocation() {
+  override Location getALocation() {
     cil_type_location(this, result)
     or
-    result = getUnboundType().getLocation()
+    result = getSourceDeclaration().getALocation()
   }
 
   /** Holds if this type is a class. */
@@ -115,4 +115,6 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {
    * of a higher index.
    */
   int getConversionIndex() { result = 0 }
+
+  override Type getSourceDeclaration() { cil_type(this, _, _, _, result) }
 }
diff --git a/csharp/ql/test/library-tests/cil/consistency/Handles.expected b/csharp/ql/test/library-tests/cil/consistency/Handles.expected
@@ -1,6 +1,5 @@
 tooManyMatchingHandles
 missingCil
-cilLocationViolation
 csharpLocationViolation
 matchingObjectMethods
 | Equals(object) | System.Boolean System.Object.Equals(System.Object) |
diff --git a/csharp/ql/test/library-tests/cil/consistency/Handles.ql b/csharp/ql/test/library-tests/cil/consistency/Handles.ql
@@ -27,12 +27,6 @@ query predicate missingCil(Element e) {
   not exists(CIL::Element ce | ce.(MetadataEntity).matchesHandle(e))
 }
 
-query predicate cilLocationViolation(CIL::Element e) {
-  e instanceof MetadataEntity and
-  exists(e.getALocation()) and
-  not e.getALocation() = e.(MetadataEntity).getAssembly()
-}
-
 query predicate csharpLocationViolation(Element e) {
   e.fromLibrary() and
   e.(MetadataEntity).hasHandle() and

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,8 @@ class InvalidOverride extends MethodViolation {`
`444`	`444`
`445`	`445`	`InvalidOverride() {`
`446`	`446`	`base = getMethod().getOverriddenMethod() and`
`447`		`- not getMethod().getDeclaringType().getABaseType+() = base.getDeclaringType()`
	`447`	`+ not getMethod().getDeclaringType().getABaseType+() = base.getDeclaringType() and`
	`448`	`+ base.getDeclaringType().isSourceDeclaration() // Bases classes of constructed types aren't extracted properly.`
`448`	`449`	`}`
`449`	`450`
`450`	`451`	`override string getMessage() {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,4 @@ class ConstructedType extends ConstructedGeneric, Type { }`
`40`	`40`	`/** A constructed generic method. */`
`41`	`41`	`class ConstructedMethod extends ConstructedGeneric, Method {`
`42`	`42`	`final override UnboundGenericMethod getUnboundGeneric() { result = getUnboundMethod() }`
`43`		`-`
`44`		`- final override Location getLocation() { result = getUnboundGeneric().getLocation() }`
`45`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,10 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {`
`57`	`57`	`qualifier = this.getParent().getQualifiedName()`
`58`	`58`	`}`
`59`	`59`
`60`		`- override Location getLocation() {`
	`60`	`+ override Location getALocation() {`
`61`	`61`	`cil_type_location(this, result)`
`62`	`62`	`or`
`63`		`- result = getUnboundType().getLocation()`
	`63`	`+ result = getSourceDeclaration().getALocation()`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/** Holds if this type is a class. */`
`@@ -115,4 +115,6 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {`
`115`	`115`	`* of a higher index.`
`116`	`116`	`*/`
`117`	`117`	`int getConversionIndex() { result = 0 }`
	`118`	`+`
	`119`	`+ override Type getSourceDeclaration() { cil_type(this, _, _, _, result) }`
`118`	`120`	`}`