C++/C#: Fix formatting

Dave Bartolomeo · Dave Bartolomeo · commit bd78f689752f · 2019-11-22T16:08:49.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
@@ -112,7 +112,8 @@ class IRAutomaticVariable extends IRVariable {
     exists(Language::Variable var |
       this = TIRUserVariable(var, _, func) and
       Language::isVariableAutomatic(var)
-    ) or
+    )
+    or
     this = TIRTempVariable(func, _, _, _)
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -94,17 +94,18 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
-  query predicate duplicateOperand(Instruction instr, string message, IRFunction func,
-      string funcText) {
+  query predicate duplicateOperand(
+    Instruction instr, string message, IRFunction func, string funcText
+  ) {
     exists(OperandTag tag, int operandCount |
       operandCount = strictcount(NonPhiOperand operand |
-        operand = instr.getAnOperand() and
-        operand.getOperandTag() = tag
-      ) and
+          operand = instr.getAnOperand() and
+          operand.getOperandTag() = tag
+        ) and
       operandCount > 1 and
       not tag instanceof UnmodeledUseOperandTag and
       message = "Instruction has " + operandCount + " operands with tag '" + tag.toString() + "'" +
-        " in function '$@'." and
+          " in function '$@'." and
       func = instr.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction())
     )
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
@@ -867,8 +867,9 @@ private module CachedForDebugging {
 }
 
 module SSASanity {
-  query predicate multipleOperandMemoryLocations(OldIR::MemoryOperand operand, string message,
-      OldIR::IRFunction func, string funcText) {
+  query predicate multipleOperandMemoryLocations(
+    OldIR::MemoryOperand operand, string message, OldIR::IRFunction func, string funcText
+  ) {
     exists(int locationCount |
       locationCount = strictcount(Alias::getOperandMemoryLocation(operand)) and
       locationCount > 1 and
@@ -877,4 +878,4 @@ module SSASanity {
       message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."
     )
   }
-}
+}
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSASanity.ql b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSASanity.ql
@@ -1,6 +1,6 @@
 /**
  * @name Aliased SSA Sanity Check
- * @description Performs sanity checks on the SSA construction. This query should have no results. 
+ * @description Performs sanity checks on the SSA construction. This query should have no results.
  * @kind table
  * @id cpp/aliased-ssa-sanity-check
  */
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
@@ -112,7 +112,8 @@ class IRAutomaticVariable extends IRVariable {
     exists(Language::Variable var |
       this = TIRUserVariable(var, _, func) and
       Language::isVariableAutomatic(var)
-    ) or
+    )
+    or
     this = TIRTempVariable(func, _, _, _)
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -94,17 +94,18 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
-  query predicate duplicateOperand(Instruction instr, string message, IRFunction func,
-      string funcText) {
+  query predicate duplicateOperand(
+    Instruction instr, string message, IRFunction func, string funcText
+  ) {
     exists(OperandTag tag, int operandCount |
       operandCount = strictcount(NonPhiOperand operand |
-        operand = instr.getAnOperand() and
-        operand.getOperandTag() = tag
-      ) and
+          operand = instr.getAnOperand() and
+          operand.getOperandTag() = tag
+        ) and
       operandCount > 1 and
       not tag instanceof UnmodeledUseOperandTag and
       message = "Instruction has " + operandCount + " operands with tag '" + tag.toString() + "'" +
-        " in function '$@'." and
+          " in function '$@'." and
       func = instr.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction())
     )
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
@@ -112,7 +112,8 @@ class IRAutomaticVariable extends IRVariable {
     exists(Language::Variable var |
       this = TIRUserVariable(var, _, func) and
       Language::isVariableAutomatic(var)
-    ) or
+    )
+    or
     this = TIRTempVariable(func, _, _, _)
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -94,17 +94,18 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
-  query predicate duplicateOperand(Instruction instr, string message, IRFunction func,
-      string funcText) {
+  query predicate duplicateOperand(
+    Instruction instr, string message, IRFunction func, string funcText
+  ) {
     exists(OperandTag tag, int operandCount |
       operandCount = strictcount(NonPhiOperand operand |
-        operand = instr.getAnOperand() and
-        operand.getOperandTag() = tag
-      ) and
+          operand = instr.getAnOperand() and
+          operand.getOperandTag() = tag
+        ) and
       operandCount > 1 and
       not tag instanceof UnmodeledUseOperandTag and
       message = "Instruction has " + operandCount + " operands with tag '" + tag.toString() + "'" +
-        " in function '$@'." and
+          " in function '$@'." and
       func = instr.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction())
     )
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -867,8 +867,9 @@ private module CachedForDebugging {
 }
 
 module SSASanity {
-  query predicate multipleOperandMemoryLocations(OldIR::MemoryOperand operand, string message,
-      OldIR::IRFunction func, string funcText) {
+  query predicate multipleOperandMemoryLocations(
+    OldIR::MemoryOperand operand, string message, OldIR::IRFunction func, string funcText
+  ) {
     exists(int locationCount |
       locationCount = strictcount(Alias::getOperandMemoryLocation(operand)) and
       locationCount > 1 and
@@ -877,4 +878,4 @@ module SSASanity {
       message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."
     )
   }
-}
+}
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRVariable.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRVariable.qll
@@ -112,7 +112,8 @@ class IRAutomaticVariable extends IRVariable {
     exists(Language::Variable var |
       this = TIRUserVariable(var, _, func) and
       Language::isVariableAutomatic(var)
-    ) or
+    )
+    or
     this = TIRTempVariable(func, _, _, _)
   }
 }
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll
@@ -94,17 +94,18 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
-  query predicate duplicateOperand(Instruction instr, string message, IRFunction func,
-      string funcText) {
+  query predicate duplicateOperand(
+    Instruction instr, string message, IRFunction func, string funcText
+  ) {
     exists(OperandTag tag, int operandCount |
       operandCount = strictcount(NonPhiOperand operand |
-        operand = instr.getAnOperand() and
-        operand.getOperandTag() = tag
-      ) and
+          operand = instr.getAnOperand() and
+          operand.getOperandTag() = tag
+        ) and
       operandCount > 1 and
       not tag instanceof UnmodeledUseOperandTag and
       message = "Instruction has " + operandCount + " operands with tag '" + tag.toString() + "'" +
-        " in function '$@'." and
+          " in function '$@'." and
       func = instr.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction())
     )
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRVariable.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRVariable.qll
@@ -112,7 +112,8 @@ class IRAutomaticVariable extends IRVariable {
     exists(Language::Variable var |
       this = TIRUserVariable(var, _, func) and
       Language::isVariableAutomatic(var)
-    ) or
+    )
+    or
     this = TIRTempVariable(func, _, _, _)
   }
 }
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -94,17 +94,18 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
-  query predicate duplicateOperand(Instruction instr, string message, IRFunction func,
-      string funcText) {
+  query predicate duplicateOperand(
+    Instruction instr, string message, IRFunction func, string funcText
+  ) {
     exists(OperandTag tag, int operandCount |
       operandCount = strictcount(NonPhiOperand operand |
-        operand = instr.getAnOperand() and
-        operand.getOperandTag() = tag
-      ) and
+          operand = instr.getAnOperand() and
+          operand.getOperandTag() = tag
+        ) and
       operandCount > 1 and
       not tag instanceof UnmodeledUseOperandTag and
       message = "Instruction has " + operandCount + " operands with tag '" + tag.toString() + "'" +
-        " in function '$@'." and
+          " in function '$@'." and
       func = instr.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction())
     )
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -867,8 +867,9 @@ private module CachedForDebugging {
 }
 
 module SSASanity {
-  query predicate multipleOperandMemoryLocations(OldIR::MemoryOperand operand, string message,
-      OldIR::IRFunction func, string funcText) {
+  query predicate multipleOperandMemoryLocations(
+    OldIR::MemoryOperand operand, string message, OldIR::IRFunction func, string funcText
+  ) {
     exists(int locationCount |
       locationCount = strictcount(Alias::getOperandMemoryLocation(operand)) and
       locationCount > 1 and
@@ -877,4 +878,4 @@ module SSASanity {
       message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."
     )
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ class IRAutomaticVariable extends IRVariable {`
`112`	`112`	`exists(Language::Variable var \|`
`113`	`113`	`this = TIRUserVariable(var, _, func) and`
`114`	`114`	`Language::isVariableAutomatic(var)`
`115`		`- ) or`
	`115`	`+ )`
	`116`	`+ or`
`116`	`117`	`this = TIRTempVariable(func, _, _, _)`
`117`	`118`	`}`
`118`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -867,8 +867,9 @@ private module CachedForDebugging {`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`module SSASanity {`
`870`		`- query predicate multipleOperandMemoryLocations(OldIR::MemoryOperand operand, string message,`
`871`		`- OldIR::IRFunction func, string funcText) {`
	`870`	`+ query predicate multipleOperandMemoryLocations(`
	`871`	`+ OldIR::MemoryOperand operand, string message, OldIR::IRFunction func, string funcText`
	`872`	`+ ) {`
`872`	`873`	`exists(int locationCount \|`
`873`	`874`	`locationCount = strictcount(Alias::getOperandMemoryLocation(operand)) and`
`874`	`875`	`locationCount > 1 and`
`@@ -877,4 +878,4 @@ module SSASanity {`
`877`	`878`	`message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."`
`878`	`879`	`)`
`879`	`880`	`}`
`880`		`-}`
	`881`	`+}`