C#/C++: Autoformat post rebase.

aschackmull · aschackmull · commit 0d4b2e4bf7cd · 2020-01-29T13:16:46.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
@@ -161,7 +161,8 @@ private predicate instructionTaintStep(Instruction i1, Instruction i2) {
   i2.(PointerAddInstruction).getLeft() = i1
   or
   // Flow from argument to return value
-  i2 = any(CallInstruction call |
+  i2 =
+    any(CallInstruction call |
       exists(int indexIn |
         modelTaintToReturnValue(call.getStaticCallTarget(), indexIn) and
         i1 = getACallArgumentOrIndirection(call, indexIn)
@@ -173,7 +174,8 @@ private predicate instructionTaintStep(Instruction i1, Instruction i2) {
   // together in a single virtual variable.
   // TODO: Will this work on the test for `TaintedPath.ql`, where the output arg
   // is a pointer addition expression?
-  i2 = any(WriteSideEffectInstruction outNode |
+  i2 =
+    any(WriteSideEffectInstruction outNode |
       exists(CallInstruction call, int indexIn, int indexOut |
         modelTaintToParameter(call.getStaticCallTarget(), indexIn, indexOut) and
         i1 = getACallArgumentOrIndirection(call, indexIn) and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -92,7 +92,8 @@ private module VirtualDispatch {
           )
           or
           exists(Variable var, FieldAccess a |
-            var = store
+            var =
+              store
                   .getDestinationAddress()
                   .(FieldAddressInstruction)
                   .getObjectAddress()
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
@@ -115,10 +115,10 @@ class PropertyProvider extends IRPropertyProvider {
       MemoryLocation useLocation, IRBlock predBlock, IRBlock defBlock, int defIndex, Overlap overlap
     |
       hasPhiOperandDefinition(_, useLocation, block, predBlock, defBlock, defIndex) and
-      key = "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() +
-          "]" and
-      result = defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() +
-          ")"
+      key =
+        "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() + "]" and
+      result =
+        defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() + ")"
     )
     or
     key = "LiveOnEntry" and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
@@ -52,10 +52,8 @@ abstract class TranslatedLocalVariableDeclaration extends TranslatedVariableInit
   final override Type getTargetType() { result = getVariableType(getVariable()) }
 
   final override TranslatedInitialization getInitialization() {
-    result = getTranslatedInitialization(getVariable()
-            .getInitializer()
-            .getExpr()
-            .getFullyConverted())
+    result =
+      getTranslatedInitialization(getVariable().getInitializer().getExpr().getFullyConverted())
   }
 
   final override Instruction getInitializationSuccessor() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
@@ -115,10 +115,10 @@ class PropertyProvider extends IRPropertyProvider {
       MemoryLocation useLocation, IRBlock predBlock, IRBlock defBlock, int defIndex, Overlap overlap
     |
       hasPhiOperandDefinition(_, useLocation, block, predBlock, defBlock, defIndex) and
-      key = "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() +
-          "]" and
-      result = defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() +
-          ")"
+      key =
+        "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() + "]" and
+      result =
+        defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() + ")"
     )
     or
     key = "LiveOnEntry" and
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
@@ -115,10 +115,10 @@ class PropertyProvider extends IRPropertyProvider {
       MemoryLocation useLocation, IRBlock predBlock, IRBlock defBlock, int defIndex, Overlap overlap
     |
       hasPhiOperandDefinition(_, useLocation, block, predBlock, defBlock, defIndex) and
-      key = "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() +
-          "]" and
-      result = defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() +
-          ")"
+      key =
+        "PhiUse[" + useLocation.toString() + " from " + predBlock.getDisplayIndex().toString() + "]" and
+      result =
+        defBlock.getDisplayIndex().toString() + "_" + defIndex + " (" + overlap.toString() + ")"
     )
     or
     key = "LiveOnEntry" and
