C++: Autoformat for named destructors in IR

Robert Marsh · Robert Marsh · commit d1160f86e198 · 2024-02-09T22:35:12.000Z
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
@@ -261,7 +261,7 @@ CppType getInstructionOperandType(Instruction instruction, TypedOperandTag tag)
 Instruction getPhiInstructionBlockStart(PhiInstruction instr) { none() }
 
 Instruction getInstructionSuccessor(Instruction instruction, EdgeKind kind) {
-            result =
+  result =
     getInstructionTranslatedElement(instruction)
         .getInstructionSuccessor(getInstructionTag(instruction), kind)
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
@@ -447,7 +447,9 @@ private int initializeAllocationGroup() { result = 3 }
 abstract class TranslatedSideEffect extends TranslatedElement {
   final override TranslatedElement getChild(int n) { none() }
 
-  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }
+  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {
+    none()
+  }
 
   final override Instruction getFirstInstruction(EdgeKind kind) {
     result = this.getInstruction(OnlyInstructionTag()) and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
@@ -70,7 +70,9 @@ abstract class TranslatedFlexibleCondition extends TranslatedCondition, Conditio
     none()
   }
 
-  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }
+  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {
+    none()
+  }
 
   abstract TranslatedCondition getOperand();
 }
@@ -96,7 +98,9 @@ class TranslatedParenthesisCondition extends TranslatedFlexibleCondition {
 abstract class TranslatedNativeCondition extends TranslatedCondition, TTranslatedNativeCondition {
   TranslatedNativeCondition() { this = TTranslatedNativeCondition(expr) }
 
-  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }
+  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {
+    none()
+  }
 }
 
 abstract class TranslatedBinaryLogicalOperation extends TranslatedNativeCondition, ConditionContext {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
@@ -407,7 +407,9 @@ abstract class TranslatedParameter extends TranslatedElement {
     result = this.getParent().getChildSuccessor(this, kind)
   }
 
-  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }
+  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {
+    none()
+  }
 
   final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
     tag = InitializerVariableAddressTag() and
@@ -762,7 +764,7 @@ class TranslatedReadEffects extends TranslatedElement, TTranslatedReadEffects {
             .getFirstInstruction(any(GotoEdge goto))
     else result = this.getParent().getChildSuccessor(this, any(GotoEdge goto))
   }
-  
+
   override TranslatedElement getLastChild() {
     result = this.getChild(max(int id | exists(this.getChild(id))))
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedGlobalVar.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedGlobalVar.qll
@@ -27,7 +27,9 @@ class TranslatedStaticStorageDurationVarInit extends TranslatedRootElement,
     kind instanceof GotoEdge
   }
 
-  override Instruction getALastInstructionInternal() { result = this.getInstruction(ExitFunctionTag()) }
+  override Instruction getALastInstructionInternal() {
+    result = this.getInstruction(ExitFunctionTag())
+  }
 
   override TranslatedElement getChild(int n) {
     n = 1 and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -384,7 +384,9 @@ class TranslatedExprStmt extends TranslatedStmt {
     result = this.getExpr().getFirstInstruction(kind)
   }
 
-  override Instruction getALastInstructionInternal() { result = this.getExpr().getALastInstruction() }
+  override Instruction getALastInstructionInternal() {
+    result = this.getExpr().getALastInstruction()
+  }
 
   override TranslatedElement getLastChild() { result = this.getExpr() }
 
@@ -997,7 +999,8 @@ class TranslatedForStmt extends TranslatedLoop {
     child = this.getUpdate() and result = this.getFirstConditionInstruction(kind)
     or
     exists(int lastDestructorIndex |
-      lastDestructorIndex = max(int n | exists(this.getChild(n)) and n >= this.getFirstDestructorCallIndex()) and
+      lastDestructorIndex =
+        max(int n | exists(this.getChild(n)) and n >= this.getFirstDestructorCallIndex()) and
       child = this.getChild(lastDestructorIndex) and
       result = this.getParent().getChildSuccessor(this, kind)
     )
@@ -1162,7 +1165,9 @@ class TranslatedSwitchStmt extends TranslatedStmt {
     else result = this.getFirstExprInstruction(kind)
   }
 
-  override Instruction getALastInstructionInternal() { result = this.getBody().getALastInstruction() }
+  override Instruction getALastInstructionInternal() {
+    result = this.getBody().getALastInstruction()
+  }
 
   override TranslatedElement getLastChild() { result = this.getBody() }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ CppType getInstructionOperandType(Instruction instruction, TypedOperandTag tag)`
`261`	`261`	`Instruction getPhiInstructionBlockStart(PhiInstruction instr) { none() }`
`262`	`262`
`263`	`263`	`Instruction getInstructionSuccessor(Instruction instruction, EdgeKind kind) {`
`264`		`- result =`
	`264`	`+ result =`
`265`	`265`	`getInstructionTranslatedElement(instruction)`
`266`	`266`	`.getInstructionSuccessor(getInstructionTag(instruction), kind)`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ abstract class TranslatedFlexibleCondition extends TranslatedCondition, Conditio`
`70`	`70`	`none()`
`71`	`71`	`}`
`72`	`72`
`73`		`- final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }`
	`73`	`+ final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {`
	`74`	`+ none()`
	`75`	`+ }`
`74`	`76`
`75`	`77`	`abstract TranslatedCondition getOperand();`
`76`	`78`	`}`
`@@ -96,7 +98,9 @@ class TranslatedParenthesisCondition extends TranslatedFlexibleCondition {`
`96`	`98`	`abstract class TranslatedNativeCondition extends TranslatedCondition, TTranslatedNativeCondition {`
`97`	`99`	`TranslatedNativeCondition() { this = TTranslatedNativeCondition(expr) }`
`98`	`100`
`99`		`- final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }`
	`101`	`+ final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {`
	`102`	`+ none()`
	`103`	`+ }`
`100`	`104`	`}`
`101`	`105`
`102`	`106`	`abstract class TranslatedBinaryLogicalOperation extends TranslatedNativeCondition, ConditionContext {`
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,9 @@ abstract class TranslatedParameter extends TranslatedElement {`
`407`	`407`	`result = this.getParent().getChildSuccessor(this, kind)`
`408`	`408`	`}`
`409`	`409`
`410`		`- final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) { none() }`
	`410`	`+ final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {`
	`411`	`+ none()`
	`412`	`+ }`
`411`	`413`
`412`	`414`	`final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {`
`413`	`415`	`tag = InitializerVariableAddressTag() and`
`@@ -762,7 +764,7 @@ class TranslatedReadEffects extends TranslatedElement, TTranslatedReadEffects {`
`762`	`764`	`.getFirstInstruction(any(GotoEdge goto))`
`763`	`765`	`else result = this.getParent().getChildSuccessor(this, any(GotoEdge goto))`
`764`	`766`	`}`
`765`		`-`
	`767`	`+`
`766`	`768`	`override TranslatedElement getLastChild() {`
`767`	`769`	`result = this.getChild(max(int id \| exists(this.getChild(id))))`
`768`	`770`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ class TranslatedStaticStorageDurationVarInit extends TranslatedRootElement,`
`27`	`27`	`kind instanceof GotoEdge`
`28`	`28`	`}`
`29`	`29`
`30`		`- override Instruction getALastInstructionInternal() { result = this.getInstruction(ExitFunctionTag()) }`
	`30`	`+ override Instruction getALastInstructionInternal() {`
	`31`	`+ result = this.getInstruction(ExitFunctionTag())`
	`32`	`+ }`
`31`	`33`
`32`	`34`	`override TranslatedElement getChild(int n) {`
`33`	`35`	`n = 1 and`