C#: Remove deprecated predicates.

Author: michaelnebel

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

@@ -21,70 +21,6 @@ private import TypeRef
  * (`LocalFunction`).
  */
 class Callable extends Parameterizable, ExprOrStmtParent, @callable {
-  pragma[noinline]
-  deprecated private string getDeclaringTypeLabel() { result = this.getDeclaringType().getLabel() }
-
-  pragma[noinline]
-  deprecated private string getParameterTypeLabelNonGeneric(int p) {
-    not this instanceof Generic and
-    result = this.getParameter(p).getType().getLabel()
-  }
-
-  language[monotonicAggregates]
-  pragma[nomagic]
-  deprecated private string getMethodParamListNonGeneric() {
-    result =
-      concat(int p |
-        p in [0 .. this.getNumberOfParameters() - 1]
-      |
-        this.getParameterTypeLabelNonGeneric(p), "," order by p
-      )
-  }
-
-  pragma[noinline]
-  deprecated private string getParameterTypeLabelGeneric(int p) {
-    this instanceof Generic and
-    result = this.getParameter(p).getType().getLabel()
-  }
-
-  language[monotonicAggregates]
-  pragma[nomagic]
-  deprecated private string getMethodParamListGeneric() {
-    result =
-      concat(int p |
-        p in [0 .. this.getNumberOfParameters() - 1]
-      |
-        this.getParameterTypeLabelGeneric(p), "," order by p
-      )
-  }
-
-  pragma[noinline]
-  deprecated private string getLabelNonGeneric() {
-    not this instanceof Generic and
-    result =
-      this.getReturnTypeLabel() + " " + this.getDeclaringTypeLabel() + "." +
-        this.getUndecoratedName() + "(" + this.getMethodParamListNonGeneric() + ")"
-  }
-
-  pragma[noinline]
-  deprecated private string getLabelGeneric() {
-    result =
-      this.getReturnTypeLabel() + " " + this.getDeclaringTypeLabel() + "." +
-        this.getUndecoratedName() + getGenericsLabel(this) + "(" + this.getMethodParamListGeneric() +
-        ")"
-  }
-
-  deprecated final override string getLabel() {
-    result = this.getLabelNonGeneric() or
-    result = this.getLabelGeneric()
-  }
-
-  deprecated private string getReturnTypeLabel() {
-    result = this.getReturnType().getLabel()
-    or
-    not exists(this.getReturnType()) and result = "System.Void"
-  }
-
   /** Gets the return type of this callable. */
   Type getReturnType() { none() }
 

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

@@ -27,12 +27,6 @@ class Element extends @element {
   /** Holds if this element is from an assembly. */
   predicate fromLibrary() { this.getFile().fromLibrary() }
 
-  /**
-   * Gets the "language" of this program element, as defined by the extension of the filename.
-   * For example, C# has language "cs", and Visual Basic has language "vb".
-   */
-  deprecated final string getLanguage() { result = this.getLocation().getFile().getExtension() }
-
   /**
    * Gets a comma-separated list of the names of the primary CodeQL classes to which this element belongs.
    *
@@ -159,29 +153,5 @@ class NamedElement extends Element, @named_element {
     qualifier = "" and name = this.getName()
   }
 
-  /** Gets a unique string label for this element. */
-  cached
-  deprecated string getLabel() { none() }
-
-  /** Holds if `other` has the same metadata handle in the same assembly. */
-  deprecated predicate matchesHandle(NamedElement other) {
-    exists(Assembly asm, int handle |
-      metadata_handle(this, asm, handle) and
-      metadata_handle(other, asm, handle)
-    )
-  }
-
-  /**
-   * Holds if this element was compiled from source code that is also present in the
-   * database. That is, this element corresponds to another element from source.
-   */
-  deprecated predicate compiledFromSource() {
-    not this.fromSource() and
-    exists(NamedElement other | other != this |
-      this.matchesHandle(other) and
-      other.fromSource()
-    )
-  }
-
   override string toString() { result = this.getName() }
 }

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

@@ -103,33 +103,6 @@ class ConstructedGeneric extends Generic {
   final int getNumberOfTypeArguments() { result = count(int i | exists(this.getTypeArgument(i))) }
 }
 
-/**
- * INTERNAL: Do not use.
- *
- * Constructs the label suffix for a generic method or type.
- */
-deprecated string getGenericsLabel(Generic g) {
-  result = "`" + g.(UnboundGeneric).getNumberOfTypeParameters()
-  or
-  result = "<" + typeArgs(g) + ">"
-}
-
-pragma[noinline]
-deprecated private string getTypeArgumentLabel(ConstructedGeneric generic, int p) {
-  result = generic.getTypeArgument(p).getLabel()
-}
-
-language[monotonicAggregates]
-pragma[nomagic]
-deprecated private string typeArgs(ConstructedGeneric generic) {
-  result =
-    concat(int p |
-      p in [0 .. generic.getNumberOfTypeArguments() - 1]
-    |
-      getTypeArgumentLabel(generic, p), ","
-    )
-}
-
 /** Gets the type arguments as a comma-separated string. */
 language[monotonicAggregates]
 private string getTypeArgumentsToString(ConstructedGeneric cg) {
@@ -264,8 +237,6 @@ class TypeParameter extends Type, @type_parameter {
   /** Gets the index of this type parameter. For example the index of `U` in `Func<T,U>` is 1. */
   override int getIndex() { type_parameters(this, result, _, _) }
 
-  deprecated final override string getLabel() { result = "!" + this.getIndex() }
-
   override string getUndecoratedName() { result = "!" + this.getIndex() }
 
   /** Gets the generic that defines this type parameter. */

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

@@ -76,30 +76,6 @@ class ValueOrRefType extends Type, Attributable, @value_or_ref_type {
   /** Gets a nested child type, if any. */
   NestedType getAChildType() { nested_types(result, this, _) }
 
-  deprecated private string getPrefixWithTypes() {
-    result = this.getDeclaringType().getLabel() + "."
-    or
-    if this.getDeclaringNamespace().isGlobalNamespace()
-    then result = ""
-    else result = this.getDeclaringNamespace().getFullName() + "."
-  }
-
-  pragma[noinline]
-  deprecated private string getLabelNonGeneric() {
-    not this instanceof Generic and
-    result = this.getPrefixWithTypes() + this.getUndecoratedName()
-  }
-
-  pragma[noinline]
-  deprecated private string getLabelGeneric() {
-    result = this.getPrefixWithTypes() + this.getUndecoratedName() + getGenericsLabel(this)
-  }
-
-  deprecated override string getLabel() {
-    result = this.getLabelNonGeneric() or
-    result = this.getLabelGeneric()
-  }
-
   /**
    * Gets the source namespace declaration in which this type is declared, if any.
    * This only holds for non-nested types.
@@ -996,8 +972,6 @@ class FunctionPointerType extends Type, Parameterizable, @function_pointer_type
   AnnotatedType getAnnotatedReturnType() { result.appliesTo(this) }
 
   override string getAPrimaryQlClass() { result = "FunctionPointerType" }
-
-  deprecated override string getLabel() { result = this.getName() }
 }
 
 /**
@@ -1116,8 +1090,6 @@ class ArrayType extends RefType, @array_type {
     array_element_type(this, _, _, getTypeRef(result))
   }
 
-  deprecated final override string getLabel() { result = this.getElementType().getLabel() + "[]" }
-
   /** Holds if this array type has the same shape (dimension and rank) as `that` array type. */
   predicate hasSameShapeAs(ArrayType that) {
     this.getDimension() = that.getDimension() and
@@ -1180,8 +1152,6 @@ class PointerType extends Type, @pointer_type {
 
   final override string getName() { types(this, _, result) }
 
-  deprecated final override string getLabel() { result = this.getReferentType().getLabel() + "*" }
-
   final override string getUndecoratedName() {
     result = this.getReferentType().getUndecoratedName()
   }
@@ -1271,8 +1241,6 @@ class TupleType extends ValueType, @tuple_type {
         ")"
   }
 
-  deprecated override string getLabel() { result = this.getUnderlyingType().getLabel() }
-
   override Type getChild(int i) { result = this.getUnderlyingType().getChild(i) }
 
   override string getAPrimaryQlClass() { result = "TupleType" }