Merge pull request #4704 from tamasvajk/feature/stats2

C#: Update DB stats file

Author: tamasvajk

csharp/ql/src/Language Abuse/UselessTypeTest.ql

@@ -12,10 +12,15 @@
 
 import csharp
 
+pragma[noinline]
+private predicate isTypePattern(IsExpr ie, ValueOrRefType t, ValueOrRefType ct) {
+  t = ie.getExpr().getType() and
+  ct = ie.getPattern().(TypePatternExpr).getCheckedType()
+}
+
 from IsExpr ie, ValueOrRefType t, ValueOrRefType ct
 where
-  t = ie.getExpr().getType() and
-  ct = ie.getPattern().(TypePatternExpr).getCheckedType() and
+  isTypePattern(ie, t, ct) and
   ct = t.getABaseType+()
 select ie,
   "There is no need to test whether an instance of $@ is also an instance of $@ - it always is.", t,

csharp/ql/src/Language Abuse/UselessUpcast.ql

@@ -86,16 +86,21 @@ class ExplicitUpcast extends ExplicitCast {
     src != dest // Handled by `cs/useless-cast-to-self`
   }
 
-  /** Holds if this upcast is the argument of a call to `target`. */
-  private predicate isArgument(Call c, Callable target) {
+  pragma[nomagic]
+  private predicate isArgument(Type t) {
     exists(Parameter p |
       this = p.getAnAssignedArgument() and
-      p.getType() = this.getType() and
-      c.getAnArgument() = this and
-      target = c.getTarget()
+      t = p.getType()
     )
   }
 
+  /** Holds if this upcast is the argument of a call to `target`. */
+  private predicate isArgument(Call c, Callable target) {
+    this.isArgument(this.getType()) and
+    c.getAnArgument() = this and
+    target = c.getTarget()
+  }
+
   /** Holds if this upcast may be used to disambiguate the target of an instance call. */
   pragma[nomagic]
   private predicate isDisambiguatingInstanceCall(InstanceCallable other, int args) {

csharp/ql/src/semmle/code/csharp/Conversion.qll

@@ -601,11 +601,12 @@ private predicate convArrayTypeCovariance(ArrayType fromType, ArrayType toType)
   convArrayTypeCovarianceJoin(fromType, toType, toType.getDimension(), toType.getRank())
 }
 
-pragma[noinline]
+pragma[nomagic]
 private predicate convArrayTypeCovarianceJoin(ArrayType fromType, ArrayType toType, int dim, int rnk) {
   convArrayElementType(fromType, toType.getElementType(), dim, rnk)
 }
 
+pragma[nomagic]
 private predicate convArrayElementType(ArrayType at, ArrayElementType aet, int dim, int rnk) {
   convRefTypeNonNull(at.getElementType(), aet) and
   dim = at.getDimension() and

csharp/ql/src/semmle/code/csharp/Variable.qll

@@ -237,6 +237,7 @@ class Parameter extends DotNet::Parameter, LocalScopeVariable, Attributable, Top
    * The assigned arguments to `x` are `1` and `4`, the assigned argument to
    * `y` is `5`, and the assigned arguments to `z` are `3` and `6`, respectively.
    */
+  pragma[nomagic]
   Expr getAnAssignedArgument() { result = getCallable().getACall().getArgumentForParameter(this) }
 
   /** Holds if this parameter is potentially overwritten in the body of its callable. */

csharp/ql/src/semmle/code/csharp/commons/StructuralComparison.qll

@@ -77,7 +77,7 @@ abstract class StructuralComparisonConfiguration extends string {
 
   private predicate sameByValue(Expr x, Expr y) { sameByValueAux(x, y, y.getValue()) }
 
-  pragma[noinline]
+  pragma[nomagic]
   private predicate sameByValueAux(Expr x, Expr y, string value) {
     candidateInternal(x, y) and
     value = x.getValue()
@@ -203,7 +203,7 @@ module Internal {
 
     private predicate sameByValue(Expr x, Expr y) { sameByValueAux(x, y, y.getValue()) }
 
-    pragma[noinline]
+    pragma[nomagic]
     private predicate sameByValueAux(Expr x, Expr y, string value) {
       candidateInternal(x, y) and
       value = x.getValue()

csharp/ql/src/semmle/code/csharp/controlflow/Guards.qll

@@ -261,6 +261,12 @@ module AbstractValues {
 
 private import AbstractValues
 
+pragma[nomagic]
+private predicate typePattern(PatternMatch pm, TypePatternExpr tpe, Type t) {
+  tpe = pm.getPattern() and
+  t = pm.getExpr().getType()
+}
+
 /**
  * An expression that evaluates to a value that can be dereferenced. That is,
  * an expression that may evaluate to `null`.
@@ -337,19 +343,23 @@ class DereferenceableExpr extends Expr {
       or
       result =
         any(PatternMatch pm |
-          pm.getExpr() = this and
-          if pm.getPattern() instanceof NullLiteral
-          then
+          this = pm.getExpr() and
+          (
             // E.g. `x is null`
+            pm.getPattern() instanceof NullLiteral and
             isNull = branch
-          else (
+            or
             // E.g. `x is string` or `x is ""`
-            branch = true and isNull = false
+            not pm.getPattern() instanceof NullLiteral and
+            branch = true and
+            isNull = false
             or
-            // E.g. `x is string` where `x` has type `string`
-            pm.getPattern().(TypePatternExpr).getCheckedType() = pm.getExpr().getType() and
-            branch = false and
-            isNull = true
+            exists(TypePatternExpr tpe |
+              // E.g. `x is string` where `x` has type `string`
+              typePattern(result, tpe, tpe.getCheckedType()) and
+              branch = false and
+              isNull = true
+            )
           )
         )
       or
@@ -1248,6 +1258,7 @@ module Internal {
       )
     }
 
+    pragma[nomagic]
     private Expr getAnEqualityCheckVal(Expr e, AbstractValue v, AbstractValue vExpr) {
       result = getAnEqualityCheck(e, v, vExpr.getAnExpr())
     }

csharp/ql/src/semmle/code/csharp/controlflow/internal/Completion.qll

@@ -388,9 +388,16 @@ private class TriedControlFlowElement extends ControlFlowElement {
   }
 }
 
-pragma[noinline]
+pragma[nomagic]
+private ValueOrRefType getACastExprBaseType(CastExpr ce) {
+  result = ce.getType().(ValueOrRefType).getABaseType()
+  or
+  result = getACastExprBaseType(ce).getABaseType()
+}
+
+pragma[nomagic]
 private predicate invalidCastCandidate(CastExpr ce) {
-  ce.getType() = ce.getExpr().getType().(ValueOrRefType).getASubType+()
+  ce.getExpr().getType() = getACastExprBaseType(ce)
 }
 
 private predicate assertion(Assertion a, int i, AssertMethod am, Expr e) {

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

@@ -1820,11 +1820,12 @@ module Ssa {
       BasicBlock bb, int i, LocalScopeSourceVariable v, ImplicitEntryDefinition def,
       ControlFlow::Nodes::ElementNode c, boolean additionalCalls
     ) {
-      exists(Callable reader |
+      exists(Callable reader, SourceVariable sv |
         implicitReadCandidate(bb, i, c, v) and
         readsCapturedVariable(c, v, reader, additionalCalls) and
-        def.getCallable() = reader and
-        def.getSourceVariable().getAssignable() = v.getAssignable()
+        sv = def.getSourceVariable() and
+        reader = sv.getEnclosingCallable() and
+        v.getAssignable() = sv.getAssignable()
       )
     }
 

csharp/ql/src/semmle/code/csharp/frameworks/NHibernate.qll

@@ -79,7 +79,7 @@ module NHibernate {
       this.getCallable()
           .getDeclaringType()
           .getDeclaringNamespace()
-          .getParent*()
+          .getParentNamespace*()
           .hasQualifiedName("", "NHibernate")
     }
   }