C++: autoformat

Robert Marsh · Robert Marsh · commit 5406783e9c49 · 2021-05-06T08:14:46.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll
@@ -329,7 +329,8 @@ predicate allocationEscapes(Configuration::Allocation allocation) {
     config.useSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())
   )
   or
-  Configuration::phaseNeedsSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())
+  Configuration::phaseNeedsSoundEscapeAnalysis() and
+  resultEscapesNonReturn(allocation.getABaseInstruction())
 }
 
 /**
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
@@ -65,7 +65,10 @@ private module Cached {
     instr = reusedPhiInstruction(_) and
     // Check that the phi instruction is *not* degenerate, but we can't use
     // getDegeneratePhiOperand in the first stage with phi instyructions
-    exists(OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2, OldInstruction oldInstruction |
+    exists(
+      OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2,
+      OldInstruction oldInstruction
+    |
       oldInstruction = instr and
       operand1 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
       operand1.getPredecessorBlock() instanceof OldBlock and
@@ -79,13 +82,14 @@ private module Cached {
     instr instanceof TUnreachedInstruction
   }
 
-  cached IRBlock getNewBlock(OldBlock oldBlock) {
+  cached
+  IRBlock getNewBlock(OldBlock oldBlock) {
     exists(Instruction newEnd, OldIR::Instruction oldEnd |
       (
-      result.getLastInstruction() = newEnd and
-      not newEnd instanceof ChiInstruction
-      or
-      newEnd = result.getLastInstruction().(ChiInstruction).getAPredecessor() // does this work?
+        result.getLastInstruction() = newEnd and
+        not newEnd instanceof ChiInstruction
+        or
+        newEnd = result.getLastInstruction().(ChiInstruction).getAPredecessor() // does this work?
       ) and
       (
         oldBlock.getLastInstruction() = oldEnd and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll
@@ -329,7 +329,8 @@ predicate allocationEscapes(Configuration::Allocation allocation) {
     config.useSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())
   )
   or
-  Configuration::phaseNeedsSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())
+  Configuration::phaseNeedsSoundEscapeAnalysis() and
+  resultEscapesNonReturn(allocation.getABaseInstruction())
 }
 
 /**
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
@@ -65,7 +65,10 @@ private module Cached {
     instr = reusedPhiInstruction(_) and
     // Check that the phi instruction is *not* degenerate, but we can't use
     // getDegeneratePhiOperand in the first stage with phi instyructions
-    exists(OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2, OldInstruction oldInstruction |
+    exists(
+      OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2,
+      OldInstruction oldInstruction
+    |
       oldInstruction = instr and
       operand1 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
       operand1.getPredecessorBlock() instanceof OldBlock and
@@ -79,13 +82,14 @@ private module Cached {
     instr instanceof TUnreachedInstruction
   }
 
-  cached IRBlock getNewBlock(OldBlock oldBlock) {
+  cached
+  IRBlock getNewBlock(OldBlock oldBlock) {
     exists(Instruction newEnd, OldIR::Instruction oldEnd |
       (
-      result.getLastInstruction() = newEnd and
-      not newEnd instanceof ChiInstruction
-      or
-      newEnd = result.getLastInstruction().(ChiInstruction).getAPredecessor() // does this work?
+        result.getLastInstruction() = newEnd and
+        not newEnd instanceof ChiInstruction
+        or
+        newEnd = result.getLastInstruction().(ChiInstruction).getAPredecessor() // does this work?
       ) and
       (
         oldBlock.getLastInstruction() = oldEnd and
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll
@@ -329,7 +329,8 @@ predicate allocationEscapes(Configuration::Allocation allocation) {
     config.useSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())
   )
   or
-  Configuration::phaseNeedsSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())
+  Configuration::phaseNeedsSoundEscapeAnalysis() and
+  resultEscapesNonReturn(allocation.getABaseInstruction())
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -65,7 +65,10 @@ private module Cached {
     instr = reusedPhiInstruction(_) and
     // Check that the phi instruction is *not* degenerate, but we can't use
     // getDegeneratePhiOperand in the first stage with phi instyructions
-    exists(OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2, OldInstruction oldInstruction |
+    exists(
+      OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2,
+      OldInstruction oldInstruction
+    |
       oldInstruction = instr and
       operand1 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
       operand1.getPredecessorBlock() instanceof OldBlock and
@@ -79,13 +82,14 @@ private module Cached {
     instr instanceof TUnreachedInstruction
   }
 
-  cached IRBlock getNewBlock(OldBlock oldBlock) {
+  cached
+  IRBlock getNewBlock(OldBlock oldBlock) {
     exists(Instruction newEnd, OldIR::Instruction oldEnd |
       (
-      result.getLastInstruction() = newEnd and
-      not newEnd instanceof ChiInstruction
-      or
-      newEnd = result.getLastInstruction().(ChiInstruction).getAPredecessor() // does this work?
+        result.getLastInstruction() = newEnd and
+        not newEnd instanceof ChiInstruction
+        or
+        newEnd = result.getLastInstruction().(ChiInstruction).getAPredecessor() // does this work?
       ) and
       (
         oldBlock.getLastInstruction() = oldEnd and

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,8 @@ predicate allocationEscapes(Configuration::Allocation allocation) {`
`329`	`329`	`config.useSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())`
`330`	`330`	`)`
`331`	`331`	`or`
`332`		`- Configuration::phaseNeedsSoundEscapeAnalysis() and resultEscapesNonReturn(allocation.getABaseInstruction())`
	`332`	`+ Configuration::phaseNeedsSoundEscapeAnalysis() and`
	`333`	`+ resultEscapesNonReturn(allocation.getABaseInstruction())`
`333`	`334`	`}`
`334`	`335`
`335`	`336`	`/**`