Skip to content

Commit 1c8e275

Browse files
C++/C#: Autoformat all the things
1 parent 7241c1a commit 1c8e275

27 files changed

+260
-522
lines changed

cpp/ql/src/semmle/code/cpp/ir/implementation/IRType.qll

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,13 @@ private import internal.IRTypeInternal
77
private newtype TIRType =
88
TIRVoidType() or
99
TIRUnknownType() or
10-
TIRErrorType() {
11-
Language::hasErrorType()
12-
} or
13-
TIRBooleanType(int byteSize) {
14-
Language::hasBooleanType(byteSize)
15-
} or
16-
TIRSignedIntegerType(int byteSize) {
17-
Language::hasSignedIntegerType(byteSize)
18-
} or
19-
TIRUnsignedIntegerType(int byteSize) {
20-
Language::hasUnsignedIntegerType(byteSize)
21-
} or
22-
TIRFloatingPointType(int byteSize) {
23-
Language::hasFloatingPointType(byteSize)
24-
} or
25-
TIRAddressType(int byteSize) {
26-
Language::hasAddressType(byteSize)
27-
} or
28-
TIRFunctionAddressType(int byteSize) {
29-
Language::hasFunctionAddressType(byteSize)
30-
} or
10+
TIRErrorType() { Language::hasErrorType() } or
11+
TIRBooleanType(int byteSize) { Language::hasBooleanType(byteSize) } or
12+
TIRSignedIntegerType(int byteSize) { Language::hasSignedIntegerType(byteSize) } or
13+
TIRUnsignedIntegerType(int byteSize) { Language::hasUnsignedIntegerType(byteSize) } or
14+
TIRFloatingPointType(int byteSize) { Language::hasFloatingPointType(byteSize) } or
15+
TIRAddressType(int byteSize) { Language::hasAddressType(byteSize) } or
16+
TIRFunctionAddressType(int byteSize) { Language::hasFunctionAddressType(byteSize) } or
3117
TIROpaqueType(Language::OpaqueTypeTag tag, int byteSize) {
3218
Language::hasOpaqueType(tag, byteSize)
3319
}
@@ -49,9 +35,7 @@ class IRType extends TIRType {
4935
* Gets a string that uniquely identifies this `IRType`. This string is often the same as the
5036
* result of `IRType.toString()`, but for some types it may be more verbose to ensure uniqueness.
5137
*/
52-
string getIdentityString() {
53-
result = toString()
54-
}
38+
string getIdentityString() { result = toString() }
5539

5640
/**
5741
* Gets the size of the type, in bytes, if known.
@@ -215,9 +199,7 @@ class IRFunctionAddressType extends IRSizedType, TIRFunctionAddressType {
215199
class IROpaqueType extends IRSizedType, TIROpaqueType {
216200
Language::OpaqueTypeTag tag;
217201

218-
IROpaqueType() {
219-
this = TIROpaqueType(tag, byteSize)
220-
}
202+
IROpaqueType() { this = TIROpaqueType(tag, byteSize) }
221203

222204
final override string toString() {
223205
result = "opaque" + byteSize.toString() + "{" + tag.toString() + "}"
@@ -246,7 +228,8 @@ module IRTypeSanity {
246228

247229
query predicate multipleCanonicalLanguageTypes(IRType type, string message) {
248230
strictcount(type.getCanonicalLanguageType()) > 1 and
249-
message = "Type has multiple canonical `LanguageType`s: " + concat(type.getCanonicalLanguageType().toString(), ", ")
231+
message = "Type has multiple canonical `LanguageType`s: " +
232+
concat(type.getCanonicalLanguageType().toString(), ", ")
250233
}
251234

252235
query predicate missingIRType(Language::LanguageType type, string message) {
@@ -256,7 +239,8 @@ module IRTypeSanity {
256239

257240
query predicate multipleIRTypes(Language::LanguageType type, string message) {
258241
strictcount(type.getIRType()) > 1 and
259-
message = "`LanguageType` " + type.getAQlClass() + " has multiple `IRType`s: " + concat(type.getIRType().toString(), ", ")
242+
message = "`LanguageType` " + type.getAQlClass() + " has multiple `IRType`s: " +
243+
concat(type.getIRType().toString(), ", ")
260244
}
261245

262246
import Language::LanguageTypeSanity

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,4 +354,3 @@ MemoryLocation getOperandMemoryLocation(MemoryOperand operand) {
354354
)
355355
)
356356
}
357-

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,7 @@ private module Cached {
305305

306306
cached
307307
predicate needsUnknownOpaqueType(int byteSize) {
308-
exists(TranslatedElement element |
309-
element.needsUnknownOpaqueType(byteSize)
310-
)
308+
exists(TranslatedElement element | element.needsUnknownOpaqueType(byteSize))
311309
}
312310

313311
cached

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,8 @@ class TranslatedSideEffect extends TranslatedElement, TTranslatedArgumentSideEff
455455
tag instanceof OnlyInstructionTag and
456456
operandType = arg.getType().getUnspecifiedType() and
457457
not operandType instanceof DerivedType and
458-
operandTag instanceof SideEffectOperandTag |
458+
operandTag instanceof SideEffectOperandTag
459+
|
459460
// If the type we select is an incomplete type (e.g. a forward-declared `struct`), there will
460461
// not be a `CppType` that represents that type. In that case, fall back to `UnknownCppType`.
461462
result = getTypeForPRValueOrUnknown(operandType)

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ private predicate ignoreExprAndDescendants(Expr expr) {
6565
)
6666
or
6767
// Do not translate input/output variables in GNU asm statements
68-
// getRealParent(expr) instanceof AsmStmt
69-
// or
68+
// getRealParent(expr) instanceof AsmStmt
69+
// or
7070
ignoreExprAndDescendants(getRealParent(expr)) // recursive case
7171
or
7272
// We do not yet translate destructors properly, so for now we ignore any
@@ -617,7 +617,7 @@ abstract class TranslatedElement extends TTranslatedElement {
617617
int getInstructionResultSize(InstructionTag tag) { none() }
618618

619619
predicate needsUnknownOpaqueType(int byteSize) { none() }
620-
620+
621621
/**
622622
* If the instruction specified by `tag` is a `StringConstantInstruction`,
623623
* gets the `StringLiteral` for that instruction.

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ abstract class TranslatedExpr extends TranslatedElement {
5454
abstract predicate producesExprResult();
5555

5656
final CppType getResultType() {
57-
if isResultGLValue() then
58-
result = getTypeForGLValue(expr.getType())
59-
else
60-
result = getTypeForPRValue(expr.getType())
57+
if isResultGLValue()
58+
then result = getTypeForGLValue(expr.getType())
59+
else result = getTypeForPRValue(expr.getType())
6160
}
6261

6362
/**
@@ -338,7 +337,7 @@ abstract class TranslatedCrementOperation extends TranslatedNonConstantExpr {
338337
final override string getInstructionConstantValue(InstructionTag tag) {
339338
tag = CrementConstantTag() and
340339
exists(Type resultType |
341-
resultType = expr.getUnspecifiedType() and
340+
resultType = expr.getUnspecifiedType() and
342341
(
343342
resultType instanceof IntegralOrEnumType and result = "1"
344343
or
@@ -353,18 +352,15 @@ abstract class TranslatedCrementOperation extends TranslatedNonConstantExpr {
353352
exists(Type resultType |
354353
resultType = expr.getUnspecifiedType() and
355354
(
356-
(
357355
resultType instanceof ArithmeticType and
358356
result = getTypeForPRValue(expr.getType())
359-
) or
357+
or
360358
resultType instanceof PointerType and result = getIntType()
361359
)
362360
)
363361
}
364362

365-
final override predicate hasInstruction(
366-
Opcode opcode, InstructionTag tag, CppType resultType
367-
) {
363+
final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
368364
tag = CrementLoadTag() and
369365
opcode instanceof Opcode::Load and
370366
resultType = getTypeForPRValue(expr.getType())
@@ -615,9 +611,7 @@ class TranslatedTransparentConversion extends TranslatedTransparentExpr {
615611
)
616612
}
617613

618-
override TranslatedExpr getOperand() {
619-
result = getTranslatedExpr(expr.getExpr())
620-
}
614+
override TranslatedExpr getOperand() { result = getTranslatedExpr(expr.getExpr()) }
621615
}
622616

623617
class TranslatedThisExpr extends TranslatedNonConstantExpr {
@@ -1242,7 +1236,7 @@ class TranslatedAssignExpr extends TranslatedAssignment {
12421236
override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
12431237
tag = AssignmentStoreTag() and
12441238
opcode instanceof Opcode::Store and
1245-
resultType = getTypeForPRValue(expr.getType()) // Always a prvalue
1239+
resultType = getTypeForPRValue(expr.getType()) // Always a prvalue
12461240
}
12471241

12481242
override Instruction getInstructionOperand(InstructionTag tag, OperandTag operandTag) {
@@ -1326,8 +1320,9 @@ class TranslatedAssignOperation extends TranslatedAssignment {
13261320
}
13271321

13281322
private predicate leftOperandNeedsConversion() {
1329-
getConvertedLeftOperandType().getUnspecifiedType() !=
1330-
getLeftOperand().getExpr().getUnspecifiedType()
1323+
getConvertedLeftOperandType().getUnspecifiedType() != getLeftOperand()
1324+
.getExpr()
1325+
.getUnspecifiedType()
13311326
}
13321327

13331328
private Opcode getOpcode() {
@@ -1367,7 +1362,7 @@ class TranslatedAssignOperation extends TranslatedAssignment {
13671362
or
13681363
tag = AssignmentStoreTag() and
13691364
opcode instanceof Opcode::Store and
1370-
resultType = getTypeForPRValue(expr.getType()) // Always a prvalue
1365+
resultType = getTypeForPRValue(expr.getType()) // Always a prvalue
13711366
or
13721367
leftOperandNeedsConversion() and
13731368
opcode instanceof Opcode::Convert and
@@ -1577,9 +1572,7 @@ class TranslatedAllocatorCall extends TTranslatedAllocatorCall, TranslatedDirect
15771572
tag = CallTargetTag() and result = expr.getAllocator()
15781573
}
15791574

1580-
final override Type getCallResultType() {
1581-
result = expr.getAllocator().getType()
1582-
}
1575+
final override Type getCallResultType() { result = expr.getAllocator().getType() }
15831576

15841577
final override TranslatedExpr getQualifier() { none() }
15851578

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,7 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
234234
/**
235235
* Holds if the function has a non-`void` return type.
236236
*/
237-
final predicate hasReturnValue() {
238-
not func.getUnspecifiedType() instanceof VoidType
239-
}
237+
final predicate hasReturnValue() { not func.getUnspecifiedType() instanceof VoidType }
240238

241239
/**
242240
* Gets the single `UnmodeledDefinition` instruction for this function.

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,10 +717,9 @@ class TranslatedElementValueInitialization extends TranslatedElementInitializati
717717
}
718718

719719
private CppType getDefaultValueType() {
720-
if elementCount = 1 then
721-
result = getTypeForPRValue(getElementType())
722-
else
723-
result = getUnknownOpaqueType(elementCount * getElementType().getSize())
720+
if elementCount = 1
721+
then result = getTypeForPRValue(getElementType())
722+
else result = getUnknownOpaqueType(elementCount * getElementType().getSize())
724723
}
725724
}
726725

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,7 @@ class TranslatedReturnValueStmt extends TranslatedReturnStmt, InitializationCont
165165
result = getInstruction(InitializerVariableAddressTag())
166166
}
167167

168-
override Type getTargetType() {
169-
result = getEnclosingFunction().getReturnType()
170-
}
168+
override Type getTargetType() { result = getEnclosingFunction().getReturnType() }
171169

172170
TranslatedInitialization getInitialization() {
173171
result = getTranslatedInitialization(stmt.getExpr().getFullyConverted())

0 commit comments

Comments
 (0)