Merge remote-tracking branch 'upstream/master' into dbartol/Indirections

Conflicts:
	cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
	csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll

cpp/ql/test/library-tests/CPP-205/elements.ql

@@ -3,12 +3,14 @@ import cpp
 string describe(Element e) {
   result = "function " + e.(Function).getFullSignature()
   or
-  result = "function declaration entry for " +
+  result =
+    "function declaration entry for " +
       e.(FunctionDeclarationEntry).getFunction().getFullSignature()
   or
   result = "parameter for " + e.(Parameter).getFunction().getFullSignature()
   or
-  result = "parameter declaration entry for " +
+  result =
+    "parameter declaration entry for " +
       e.(ParameterDeclarationEntry).getFunctionDeclarationEntry().getFunction().getFullSignature()
 }
 

cpp/ql/test/library-tests/arguments/arguments.ql

@@ -4,7 +4,8 @@ from Compilation c, int i, string s
 // Skip the extractor name; it'll vary depending on platform
 where
   i > 0 and
-  s = c
+  s =
+    c
         .getArgument(i)
         .replaceAll("\\", "/")
         .regexpReplaceAll(".*(/qltest/predefined_macros)", "<tools>$1")

cpp/ql/test/library-tests/basic_blocks/bb_cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/basic_blocks/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/c++_exceptions/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/constexpr_if/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/controlflow/guards-ir/tests.ql

@@ -64,7 +64,8 @@ query predicate irGuardsCompare(int startLine, string msg) {
       guard.comparesEq(left, right, k, false, sense) and op = " != "
     ) and
     startLine = guard.getLocation().getStartLine() and
-    msg = left.getAnyDef().getUnconvertedResultExpression() + op +
+    msg =
+      left.getAnyDef().getUnconvertedResultExpression() + op +
         right.getAnyDef().getUnconvertedResultExpression() + "+" + k + " when " + guard + " is " +
         which
   )

cpp/ql/test/library-tests/dataflow/fields/flow.ql

@@ -29,9 +29,9 @@ class Conf extends Configuration {
   }
 
   override predicate isAdditionalFlowStep(Node a, Node b) {
-    b.asPartialDefinition() = any(Call c |
-        c.getTarget().hasName("insert") and c.getAnArgument() = a.asExpr()
-      ).getQualifier()
+    b.asPartialDefinition() =
+      any(Call c | c.getTarget().hasName("insert") and c.getAnArgument() = a.asExpr())
+          .getQualifier()
     or
     b.asExpr().(AddressOfExpr).getOperand() = a.asExpr()
   }

cpp/ql/test/library-tests/destructors/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/ir/constant_func/constant_func.ql

@@ -5,7 +5,8 @@ import semmle.code.cpp.ir.internal.IntegerConstant
 
 from IRFunction irFunc, int value
 where
-  value = getValue(getConstantValue(irFunc
+  value =
+    getValue(getConstantValue(irFunc
             .getReturnInstruction()
             .(ReturnValueInstruction)
             .getReturnValue()))

cpp/ql/test/library-tests/lambdas/cfg/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/members/getters/members.ql

@@ -56,8 +56,8 @@ string functionName(Function f) {
     (
       if exists(f.getATemplateArgument())
       then
-        templateArgs = "<" + concat(int i | | f.getTemplateArgument(i).toString(), "," order by i) +
-            ">"
+        templateArgs =
+          "<" + concat(int i | | f.getTemplateArgument(i).toString(), "," order by i) + ">"
       else templateArgs = ""
     ) and
     args = "(" + concat(int i | | f.getParameter(i).getType().toString(), "," order by i) + ")"

cpp/ql/test/library-tests/nested_functions/nested_functions/nested_functions.ql

@@ -4,7 +4,8 @@ from Function f, string call
 where
   if exists(f.getACallToThisFunction())
   then
-    call = f.getACallToThisFunction().getLocation().toString() + " " +
+    call =
+      f.getACallToThisFunction().getLocation().toString() + " " +
         f.getACallToThisFunction().toString()
   else call = "<none>"
 select f, f.getType(), call

cpp/ql/test/library-tests/numlines/numlines.ql

@@ -7,7 +7,8 @@ string functionName(Function f) {
     (
       if exists(f.getATemplateArgument())
       then
-        templateArgs = "<" +
+        templateArgs =
+          "<" +
             concat(int i |
               exists(f.getTemplateArgument(i))
             |
@@ -15,7 +16,8 @@ string functionName(Function f) {
             ) + ">"
       else templateArgs = ""
     ) and
-    args = "(" +
+    args =
+      "(" +
         concat(int i |
           exists(f.getParameter(i))
         |

cpp/ql/test/library-tests/pointsto/basic/sets.ql

@@ -21,8 +21,8 @@ predicate isSetFlowEnd(boolean isEdge, int x, int y, string label) {
   (setflow(x, _) or setflow(_, x)) and
   isEdge = false and
   x = y and
-  label = "set: {" + concat(Element e | pointstosets(x, unresolveElement(e)) | e.toString(), ", ") +
-      "}"
+  label =
+    "set: {" + concat(Element e | pointstosets(x, unresolveElement(e)) | e.toString(), ", ") + "}"
 }
 
 predicate isSetFlow(boolean isEdge, int x, int y, string label) {
@@ -35,8 +35,8 @@ predicate isPointsToSetSrc(boolean isEdge, int x, int y, string label) {
   pointstosets(x, _) and
   isEdge = false and
   x = y and
-  label = "set: {" + concat(Element e | pointstosets(x, unresolveElement(e)) | e.toString(), ", ") +
-      "}"
+  label =
+    "set: {" + concat(Element e | pointstosets(x, unresolveElement(e)) | e.toString(), ", ") + "}"
 }
 
 predicate isPointsToSetDest(boolean isEdge, Element x, Element y, string label) {
@@ -57,7 +57,8 @@ predicate isPointsToSetDest(boolean isEdge, Element x, Element y, string label)
 predicate isPointsToSets(boolean isEdge, int x, Element y, string label) {
   isEdge = true and
   pointstosets(x, unresolveElement(y)) and
-  label = "pt: {" + concat(Element e | pointstosets(x, unresolveElement(e)) | e.toString(), ", ") +
+  label =
+    "pt: {" + concat(Element e | pointstosets(x, unresolveElement(e)) | e.toString(), ", ") +
       "} -> " + y.toString()
 }
 

cpp/ql/test/library-tests/structs/mutual_recursion/compatible_structs.ql

@@ -2,6 +2,6 @@ import cpp
 
 from Struct s, string distinct
 where
-  distinct = count(Struct x | x.getName() = s.getName()) + " different struct(s) called " +
-      s.getName()
+  distinct =
+    count(Struct x | x.getName() = s.getName()) + " different struct(s) called " + s.getName()
 select s, distinct

cpp/ql/test/library-tests/sub_basic_blocks/sbb_test.qll

@@ -2,9 +2,10 @@ import cpp
 import semmle.code.cpp.controlflow.SubBasicBlocks
 
 string subBasicBlockDebugInfo(SubBasicBlock sbb) {
-  result = sbb.getStart().toString() + " [line " + sbb.getStart().getLocation().getStartLine() + "-"
-      + sbb.getEnd().getLocation().getEndLine() + ", " + sbb.getNumberOfNodes() + " nodes, " +
-      "pos " + (sbb.getRankInBasicBlock(_) - 1) +
+  result =
+    sbb.getStart().toString() + " [line " + sbb.getStart().getLocation().getStartLine() + "-" +
+      sbb.getEnd().getLocation().getEndLine() + ", " + sbb.getNumberOfNodes() + " nodes, " + "pos " +
+      (sbb.getRankInBasicBlock(_) - 1) +
       any(string s | if sbb.firstInBB() then s = " (first in BB)" else s = "") +
       any(string s | if sbb.lastInBB() then s = " (last in BB)" else s = "") + ", " +
       count(sbb.getAPredecessor()) + " predecessors, " + count(sbb.getASuccessor()) + " successors" +

cpp/ql/test/library-tests/syntax-zoo/Compare.qll

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }
@@ -66,7 +67,8 @@ Element getScopeElement(ControlFlowNode x) {
 string getScopeName(ControlFlowNode x) {
   exists(Function scope | scope = getScopeElement(x) |
     differentScope(scope) and
-    result = scope.getFile().getBaseName().splitAt(".", 0) + "__" +
+    result =
+      scope.getFile().getBaseName().splitAt(".", 0) + "__" +
         scope.getQualifiedName().replaceAll("::", "_")
   )
   or

cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromtemplateinstantiation.ql

@@ -9,7 +9,8 @@ class FunctionMonkeyPatch extends Function {
       (
         if exists(this.getATemplateArgument())
         then
-          templateArgs = "<" +
+          templateArgs =
+            "<" +
               concat(int i |
                 exists(this.getTemplateArgument(i))
               |
@@ -17,7 +18,8 @@ class FunctionMonkeyPatch extends Function {
               ) + ">"
         else templateArgs = ""
       ) and
-      args = "(" +
+      args =
+        "(" +
           concat(int i |
             exists(this.getParameter(i))
           |

cpp/ql/test/library-tests/virtual_functions/cfg/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/library-tests/vla/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/break_labels/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/conditional_destructors/cfg.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/pruning/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/returnstmt/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }

cpp/ql/test/successor-tests/switchstmt/switchbody/graphable.ql

@@ -5,7 +5,8 @@ class DestructorCallEnhanced extends DestructorCall {
   override string toString() {
     if exists(this.getQualifier().(VariableAccess).getTarget().getName())
     then
-      result = "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
+      result =
+        "call to " + this.getQualifier().(VariableAccess).getTarget().getName() + "." +
           this.getTarget().getName()
     else result = super.toString()
   }