Merge pull request #15393 from erik-krogh/deps-jan-2024

All: delete outdated deprecations
2026-04-25 16:55:19 +02:00 · 2024-01-23 13:52:38 +01:00
parent 43453fea52 865df920f9
commit f1d6f56621
128 changed files with 56 additions and 1979 deletions
--- a/cpp/ql/lib/change-notes/2024-01-22-outdated-deprecations.md
+++ b/cpp/ql/lib/change-notes/2024-01-22-outdated-deprecations.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Deleted many deprecated predicates and classes with uppercase `XML`, `SSA`, `SAL`, `SQL`, etc. in their names. Use the PascalCased versions instead.
+* Deleted the deprecated `StrcatFunction` class, use `semmle.code.cpp.models.implementations.Strcat.qll` instead.
--- a/cpp/ql/lib/semmle/code/cpp/Class.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Class.qll
@@ -380,9 +380,6 @@ class Class extends UserType {
   */
  predicate isPod() { is_pod_class(underlyingElement(this)) }

-  /** DEPRECATED: Alias for isPod */
-  deprecated predicate isPOD() { this.isPod() }
-
  /**
   * Holds if this class, struct or union is a standard-layout class
   * [N4140 9(7)]. Also holds for structs in C programs.
--- a/cpp/ql/lib/semmle/code/cpp/PODType03.qll
+++ b/cpp/ql/lib/semmle/code/cpp/PODType03.qll
@@ -104,9 +104,6 @@ predicate isPodClass03(Class c) {
  )
 }

-/** DEPRECATED: Alias for isPodClass03 */
-deprecated predicate isPODClass03 = isPodClass03/1;
-
 /**
 * Holds if `t` is a POD type, according to the rules specified in
 * C++03 3.9(10):
@@ -126,6 +123,3 @@ predicate isPodType03(Type t) {
    isPodType03(ut.(SpecifiedType).getUnspecifiedType())
  )
 }
-
-/** DEPRECATED: Alias for isPodType03 */
-deprecated predicate isPODType03 = isPodType03/1;
--- a/cpp/ql/lib/semmle/code/cpp/XML.qll
+++ b/cpp/ql/lib/semmle/code/cpp/XML.qll
@@ -32,9 +32,6 @@ class XmlLocatable extends @xmllocatable, TXmlLocatable {
  string toString() { none() } // overridden in subclasses
 }

-/** DEPRECATED: Alias for XmlLocatable */
-deprecated class XMLLocatable = XmlLocatable;
-
 /**
 * An `XmlParent` is either an `XmlElement` or an `XmlFile`,
 * both of which can contain other elements.
@@ -95,9 +92,6 @@ class XmlParent extends @xmlparent {
  string toString() { result = this.getName() }
 }

-/** DEPRECATED: Alias for XmlParent */
-deprecated class XMLParent = XmlParent;
-
 /** An XML file. */
 class XmlFile extends XmlParent, File {
  XmlFile() { xmlEncoding(this, _) }
@@ -119,14 +113,8 @@ class XmlFile extends XmlParent, File {

  /** Gets a DTD associated with this XML file. */
  XmlDtd getADtd() { xmlDTDs(result, _, _, _, this) }
-
-  /** DEPRECATED: Alias for getADtd */
-  deprecated XmlDtd getADTD() { result = this.getADtd() }
 }

-/** DEPRECATED: Alias for XmlFile */
-deprecated class XMLFile = XmlFile;
-
 /**
 * An XML document type definition (DTD).
 *
@@ -163,9 +151,6 @@ class XmlDtd extends XmlLocatable, @xmldtd {
  }
 }

-/** DEPRECATED: Alias for XmlDtd */
-deprecated class XMLDTD = XmlDtd;
-
 /**
 * An XML element in an XML file.
 *
@@ -221,9 +206,6 @@ class XmlElement extends @xmlelement, XmlParent, XmlLocatable {
  override string toString() { result = this.getName() }
 }

-/** DEPRECATED: Alias for XmlElement */
-deprecated class XMLElement = XmlElement;
-
 /**
 * An attribute that occurs inside an XML element.
 *
@@ -254,9 +236,6 @@ class XmlAttribute extends @xmlattribute, XmlLocatable {
  override string toString() { result = this.getName() + "=" + this.getValue() }
 }

-/** DEPRECATED: Alias for XmlAttribute */
-deprecated class XMLAttribute = XmlAttribute;
-
 /**
 * A namespace used in an XML file.
 *
@@ -273,9 +252,6 @@ class XmlNamespace extends XmlLocatable, @xmlnamespace {
  /** Gets the URI of this namespace. */
  string getUri() { xmlNs(this, _, result, _) }

-  /** DEPRECATED: Alias for getUri */
-  deprecated string getURI() { result = this.getUri() }
-
  /** Holds if this namespace has no prefix. */
  predicate isDefault() { this.getPrefix() = "" }

@@ -286,9 +262,6 @@ class XmlNamespace extends XmlLocatable, @xmlnamespace {
  }
 }

-/** DEPRECATED: Alias for XmlNamespace */
-deprecated class XMLNamespace = XmlNamespace;
-
 /**
 * A comment in an XML file.
 *
@@ -309,9 +282,6 @@ class XmlComment extends @xmlcomment, XmlLocatable {
  override string toString() { result = this.getText() }
 }

-/** DEPRECATED: Alias for XmlComment */
-deprecated class XMLComment = XmlComment;
-
 /**
 * A sequence of characters that occurs between opening and
 * closing tags of an XML element, excluding other elements.
@@ -335,6 +305,3 @@ class XmlCharacters extends @xmlcharacters, XmlLocatable {
  /** Gets a printable representation of this XML character sequence. */
  override string toString() { result = this.getCharacters() }
 }
-
-/** DEPRECATED: Alias for XmlCharacters */
-deprecated class XMLCharacters = XmlCharacters;
--- a/cpp/ql/lib/semmle/code/cpp/commons/NULL.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/NULL.qll
@@ -5,9 +5,6 @@ class NullMacro extends Macro {
  NullMacro() { this.getHead() = "NULL" }
 }

-/** DEPRECATED: Alias for NullMacro */
-deprecated class NULLMacro = NullMacro;
-
 /** A use of the NULL macro. */
 class NULL extends Literal {
  NULL() { exists(NullMacro nm | this = nm.getAnInvocation().getAnExpandedElement()) }
--- a/cpp/ql/lib/semmle/code/cpp/commons/Strcat.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Strcat.qll
@@ -1,22 +0,0 @@
-import cpp
-
-/**
- * DEPRECATED: use `semmle.code.cpp.models.implementations.Strcat.qll` instead.
- *
- * A function that concatenates the string from its second argument
- * to the string from its first argument, for example `strcat`.
- */
-deprecated class StrcatFunction extends Function {
-  StrcatFunction() {
-    this.getName() =
-      [
-        "strcat", // strcat(dst, src)
-        "strncat", // strncat(dst, src, max_amount)
-        "wcscat", // wcscat(dst, src)
-        "_mbscat", // _mbscat(dst, src)
-        "wcsncat", // wcsncat(dst, src, max_amount)
-        "_mbsncat", // _mbsncat(dst, src, max_amount)
-        "_mbsncat_l" // _mbsncat_l(dst, src, max_amount, locale)
-      ]
-  }
-}
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
@@ -1068,6 +1068,3 @@ module Ssa {

  predicate hasUnreachedInstruction = Cached::hasUnreachedInstructionCached/1;
 }
-
-/** DEPRECATED: Alias for Ssa */
-deprecated module SSA = Ssa;
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
@@ -3,13 +3,6 @@ import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.Rea
 import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.Dominance as Dominance
 import semmle.code.cpp.ir.implementation.aliased_ssa.IR as NewIR
 import semmle.code.cpp.ir.implementation.internal.TInstruction::AliasedSsaInstructions as SsaInstructions
-
-/** DEPRECATED: Alias for SsaInstructions */
-deprecated module SSAInstructions = SsaInstructions;
-
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import AliasedSSA as Alias
 import semmle.code.cpp.ir.implementation.internal.TOperand::AliasedSsaOperands as SsaOperands
-
-/** DEPRECATED: Alias for SsaOperands */
-deprecated module SSAOperands = SsaOperands;
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
@@ -2,6 +2,3 @@ import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as IRConstruction
 import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSsa
 import semmle.code.cpp.ir.implementation.aliased_ssa.internal.SSAConstruction as AliasedSsa
-
-/** DEPRECATED: Alias for AliasedSsa */
-deprecated module AliasedSSA = AliasedSsa;
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -1068,6 +1068,3 @@ module Ssa {

  predicate hasUnreachedInstruction = Cached::hasUnreachedInstructionCached/1;
 }
-
-/** DEPRECATED: Alias for Ssa */
-deprecated module SSA = Ssa;
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
@@ -4,13 +4,6 @@ import semmle.code.cpp.ir.implementation.raw.internal.reachability.Dominance as
 import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as NewIR
 import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as RawStage
 import semmle.code.cpp.ir.implementation.internal.TInstruction::UnaliasedSsaInstructions as SsaInstructions
-
-/** DEPRECATED: Alias for SsaInstructions */
-deprecated module SSAInstructions = SsaInstructions;
-
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import SimpleSSA as Alias
 import semmle.code.cpp.ir.implementation.internal.TOperand::UnaliasedSsaOperands as SsaOperands
-
-/** DEPRECATED: Alias for SsaOperands */
-deprecated module SSAOperands = SsaOperands;
--- a/cpp/ql/src/Microsoft/SAL.qll
+++ b/cpp/ql/src/Microsoft/SAL.qll
@@ -22,9 +22,6 @@ class SalMacro extends Macro {
  }
 }

-/** DEPRECATED: Alias for SalMacro */
-deprecated class SALMacro = SalMacro;
-
 pragma[noinline]
 private predicate isTopLevelMacroAccess(MacroAccess ma) { not exists(ma.getParentInvocation()) }

@@ -50,9 +47,6 @@ class SalAnnotation extends MacroInvocation {
  }
 }

-/** DEPRECATED: Alias for SalAnnotation */
-deprecated class SALAnnotation = SalAnnotation;
-
 /**
 * A SAL macro indicating that the return value of a function should always be
 * checked.
@@ -63,9 +57,6 @@ class SalCheckReturn extends SalAnnotation {
  }
 }

-/** DEPRECATED: Alias for SalCheckReturn */
-deprecated class SALCheckReturn = SalCheckReturn;
-
 /**
 * A SAL macro indicating that a pointer variable or return value should not be
 * `NULL`.
@@ -89,9 +80,6 @@ class SalNotNull extends SalAnnotation {
  }
 }

-/** DEPRECATED: Alias for SalNotNull */
-deprecated class SALNotNull = SalNotNull;
-
 /**
 * A SAL macro indicating that a value may be `NULL`.
 */
@@ -105,9 +93,6 @@ class SalMaybeNull extends SalAnnotation {
  }
 }

-/** DEPRECATED: Alias for SalMaybeNull */
-deprecated class SALMaybeNull = SalMaybeNull;
-
 /**
 * A parameter annotated by one or more SAL annotations.
 */
@@ -124,9 +109,6 @@ class SalParameter extends Parameter {
  predicate isInOut() { a.getMacroName().toLowerCase().matches("%\\_inout%") }
 }

-/** DEPRECATED: Alias for SalParameter */
-deprecated class SALParameter = SalParameter;
-
 ///////////////////////////////////////////////////////////////////////////////
 // Implementation details
 /**
@@ -199,9 +181,6 @@ class SalElement extends Element {
  }
 }

-/** DEPRECATED: Alias for SalElement */
-deprecated class SALElement = SalElement;
-
 /** Holds if `file` contains a SAL annotation. */
 pragma[noinline]
 private predicate containsSalAnnotation(File file) { any(SalAnnotation a).getFile() = file }
--- a/cpp/ql/src/Security/CWE/CWE-497/SystemData.qll
+++ b/cpp/ql/src/Security/CWE/CWE-497/SystemData.qll
@@ -55,9 +55,6 @@ class SqlClientInfo extends SystemData {
  override predicate isSensitive() { any() }
 }

-/** DEPRECATED: Alias for SqlClientInfo */
-deprecated class SQLClientInfo = SqlClientInfo;
-
 private predicate sqlConnectInfo(FunctionCall source, Expr use) {
  (
    source.getTarget().hasName("mysql_connect") or
@@ -77,9 +74,6 @@ class SqlConnectInfo extends SystemData {
  override predicate isSensitive() { any() }
 }

-/** DEPRECATED: Alias for SqlConnectInfo */
-deprecated class SQLConnectInfo = SqlConnectInfo;
-
 private predicate posixSystemInfo(FunctionCall source, DataFlow::Node use) {
  // size_t confstr(int name, char *buf, size_t len)
  //  - various OS / system strings, such as the libc version