C#: Use the location of the unbound declaration.

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/Callable.qll

@@ -265,9 +265,7 @@ class Method extends Callable, Virtualizable, Attributable, @method {
     result = Virtualizable.super.getAnUltimateImplementor()
   }
 
-  override Location getALocation() {
-    exists(Method m | m = this.getUnboundDeclaration() | method_location(m, result))
-  }
+  override Location getALocation() { method_location(this.getUnboundDeclaration(), result) }
 
   /** Holds if this method is an extension method. */
   predicate isExtensionMethod() { this.getParameter(0).hasExtensionMethodModifier() }

csharp/ql/lib/semmle/code/csharp/Event.qll

@@ -68,7 +68,7 @@ class Event extends DeclarationWithAccessors, @event {
     result = DeclarationWithAccessors.super.getAnUltimateImplementor()
   }
 
-  override Location getALocation() { event_location(this, result) }
+  override Location getALocation() { event_location(this.getUnboundDeclaration(), result) }
 
   override string getAPrimaryQlClass() { result = "Event" }
 }
@@ -99,7 +99,7 @@ class EventAccessor extends Accessor, @event_accessor {
 
   override Event getDeclaration() { event_accessors(this, _, _, result, _) }
 
-  override Location getALocation() { event_accessor_location(this, result) }
+  override Location getALocation() { event_accessor_location(this.getUnboundDeclaration(), result) }
 }
 
 /**

csharp/ql/lib/semmle/code/csharp/Property.qll

@@ -196,7 +196,7 @@ class Property extends DeclarationWithGetSetAccessors, @property {
 
   override PropertyAccess getAnAccess() { result.getTarget() = this }
 
-  override Location getALocation() { property_location(this, result) }
+  override Location getALocation() { property_location(this.getUnboundDeclaration(), result) }
 
   override Expr getAnAssignedValue() {
     result = DeclarationWithGetSetAccessors.super.getAnAssignedValue()
@@ -328,7 +328,7 @@ class Indexer extends DeclarationWithGetSetAccessors, Parameterizable, @indexer
     result = DeclarationWithGetSetAccessors.super.getAnUltimateImplementor()
   }
 
-  override Location getALocation() { indexer_location(this, result) }
+  override Location getALocation() { indexer_location(this.getUnboundDeclaration(), result) }
 
   override string toStringWithTypes() {
     result = this.getName() + "[" + this.parameterTypesToString() + "]"
@@ -408,7 +408,7 @@ class Accessor extends Callable, Modifiable, Attributable, Overridable, @callabl
 
   override Accessor getUnboundDeclaration() { accessors(this, _, _, _, result) }
 
-  override Location getALocation() { accessor_location(this, result) }
+  override Location getALocation() { accessor_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = this.getName() }
 }