Merge branch 'main' into redosPrefix

Author: erik-krogh

cpp/ql/lib/experimental/semmle/code/cpp/semantic/SemanticExprSpecific.qll

@@ -292,22 +292,20 @@ module SemanticExprConfig {
 
   class Guard = IRGuards::IRGuardCondition;
 
-  predicate guard(Guard guard, BasicBlock block) {
-    block = guard.(IRGuards::IRGuardCondition).getBlock()
-  }
+  predicate guard(Guard guard, BasicBlock block) { block = guard.getBlock() }
 
   Expr getGuardAsExpr(Guard guard) { result = guard }
 
   predicate equalityGuard(Guard guard, Expr e1, Expr e2, boolean polarity) {
-    guard.(IRGuards::IRGuardCondition).comparesEq(e1.getAUse(), e2.getAUse(), 0, true, polarity)
+    guard.comparesEq(e1.getAUse(), e2.getAUse(), 0, true, polarity)
   }
 
   predicate guardDirectlyControlsBlock(Guard guard, BasicBlock controlled, boolean branch) {
-    guard.(IRGuards::IRGuardCondition).controls(controlled, branch)
+    guard.controls(controlled, branch)
   }
 
   predicate guardHasBranchEdge(Guard guard, BasicBlock bb1, BasicBlock bb2, boolean branch) {
-    guard.(IRGuards::IRGuardCondition).controlsEdge(bb1, bb2, branch)
+    guard.controlsEdge(bb1, bb2, branch)
   }
 
   Guard comparisonGuard(Expr e) { result = e }

cpp/ql/lib/semmle/code/cpp/File.qll

@@ -218,8 +218,6 @@ class Folder extends Container, @folder {
 class File extends Container, @file {
   override string getAbsolutePath() { files(underlyingElement(this), result) }
 
-  override string toString() { result = Container.super.toString() }
-
   override string getAPrimaryQlClass() { result = "File" }
 
   override Location getLocation() {

cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql

@@ -268,7 +268,11 @@ class PathElement extends TPathElement {
   predicate isSink(IRBlock block) { exists(this.asSink(block)) }
 
   string toString() {
-    result = [asStore().toString(), asCall(_).toString(), asMid().toString(), asSink(_).toString()]
+    result =
+      [
+        this.asStore().toString(), this.asCall(_).toString(), this.asMid().toString(),
+        this.asSink(_).toString()
+      ]
   }
 
   predicate hasLocationInfo(

cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql

@@ -67,7 +67,7 @@ predicate findUseCharacterConversion(Expr exp, string msg) {
   exists(FunctionCall fc |
     fc = exp and
     (
-      exists(Loop lptmp | lptmp = fc.getEnclosingStmt().getParentStmt*()) and
+      fc.getEnclosingStmt().getParentStmt*() instanceof Loop and
       fc.getTarget().hasName(["mbtowc", "mbrtowc", "_mbtowc_l"]) and
       not fc.getArgument(0).isConstant() and
       not fc.getArgument(1).isConstant() and

cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql

@@ -44,11 +44,8 @@ predicate conversionDoneLate(MulExpr mexp) {
       mexp.getEnclosingElement().(ComparisonOperation).hasOperands(mexp, e0) and
       e0.getType().getSize() = mexp.getConversion().getConversion().getType().getSize()
       or
-      e0.(FunctionCall)
-          .getTarget()
-          .getParameter(argumentPosition(e0.(FunctionCall), mexp, _))
-          .getType()
-          .getSize() = mexp.getConversion().getConversion().getType().getSize()
+      e0.(FunctionCall).getTarget().getParameter(argumentPosition(e0, mexp, _)).getType().getSize() =
+        mexp.getConversion().getConversion().getType().getSize()
     )
   )
 }
@@ -75,7 +72,7 @@ predicate signSmallerWithEqualSizes(MulExpr mexp) {
       ae.getRValue().getUnderlyingType().(IntegralType).isUnsigned() and
       ae.getLValue().getUnderlyingType().(IntegralType).isSigned() and
       (
-        not exists(DivExpr de | mexp.getParent*() = de)
+        not mexp.getParent*() instanceof DivExpr
         or
         exists(DivExpr de, Expr ec |
           e2.isConstant() and

csharp/ql/lib/semmle/code/cil/Types.qll

@@ -309,8 +309,6 @@ class FunctionPointerType extends Type, CustomModifierReceiver, Parameterizable,
   /** Gets the calling convention. */
   int getCallingConvention() { cil_function_pointer_calling_conventions(this, result) }
 
-  override string toString() { result = Type.super.toString() }
-
   /** Holds if the return type is `void`. */
   predicate returnsVoid() { this.getReturnType() instanceof VoidType }
 

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

@@ -215,11 +215,7 @@ class Callable extends DotNet::Callable, Parameterizable, ExprOrStmtParent, @cal
   /** Gets a `Call` that has this callable as a target. */
   Call getACall() { this = result.getTarget() }
 
-  override Parameter getParameter(int n) { result = Parameterizable.super.getParameter(n) }
-
   override Parameter getAParameter() { result = Parameterizable.super.getAParameter() }
-
-  override int getNumberOfParameters() { result = Parameterizable.super.getNumberOfParameters() }
 }
 
 /**
@@ -276,8 +272,6 @@ class Method extends Callable, Virtualizable, Attributable, @method {
   predicate hasParams() { exists(this.getParamsType()) }
 
   // Remove when `Callable.isOverridden()` is removed
-  override predicate isOverridden() { Virtualizable.super.isOverridden() }
-
   override predicate fromSource() {
     Callable.super.fromSource() and
     not this.isCompilerGenerated()
@@ -472,8 +466,6 @@ class RecordCloneMethod extends Method, DotNet::RecordCloneCallable {
   override Constructor getConstructor() {
     result = DotNet::RecordCloneCallable.super.getConstructor()
   }
-
-  override string toString() { result = Method.super.toString() }
 }
 
 /**

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

@@ -116,10 +116,6 @@ class Namespace extends DotNet::Namespace, TypeContainer, Declaration, @namespac
   override Location getALocation() { result = this.getADeclaration().getALocation() }
 
   override string toString() { result = DotNet::Namespace.super.toString() }
-
-  override predicate hasQualifiedName(string a, string b) {
-    DotNet::Namespace.super.hasQualifiedName(a, b)
-  }
 }
 
 /**

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

@@ -42,8 +42,6 @@ class DeclarationWithAccessors extends AssignableMember, Virtualizable, Attribut
   }
 
   override Type getType() { none() }
-
-  override string toString() { result = AssignableMember.super.toString() }
 }
 
 /**

csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll

@@ -163,10 +163,6 @@ module Ssa {
    * (`ImplicitDefinition`), or a phi node (`PhiNode`).
    */
   class Definition extends SsaImpl::Definition {
-    final override SourceVariable getSourceVariable() {
-      result = SsaImpl::Definition.super.getSourceVariable()
-    }
-
     /**
      * Gets the control flow node of this SSA definition, if any. Phi nodes are
      * examples of SSA definitions without a control flow node, as they are