From da5e3d64acc96bb9fb446f56d2c3c4b9bbf92dce Mon Sep 17 00:00:00 2001 From: Robert Marsh Date: Fri, 23 Feb 2024 16:20:42 +0000 Subject: [PATCH] C++: autoformat --- .../raw/internal/TranslatedElement.qll | 27 +++++++++++++------ .../raw/internal/TranslatedStmt.qll | 3 +-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll index 70dae0cfacf..8d2242df4ab 100644 --- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll +++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll @@ -611,16 +611,27 @@ newtype TTranslatedElement = TTranslatedInitialization(Expr expr) { not ignoreExpr(expr) and ( - exists(Initializer init | init.getExpr().getFullyConverted() = expr) or - exists(ClassAggregateLiteral initList | initList.getAFieldExpr(_).getFullyConverted() = expr) or + exists(Initializer init | init.getExpr().getFullyConverted() = expr) + or + exists(ClassAggregateLiteral initList | initList.getAFieldExpr(_).getFullyConverted() = expr) + or exists(ArrayOrVectorAggregateLiteral initList | initList.getAnElementExpr(_).getFullyConverted() = expr - ) or - exists(ReturnStmt returnStmt | returnStmt.getExpr().getFullyConverted() = expr and hasReturnValue(returnStmt.getEnclosingFunction())) or - exists(ConstructorFieldInit fieldInit | fieldInit.getExpr().getFullyConverted() = expr) or - exists(NewExpr newExpr | newExpr.getInitializer().getFullyConverted() = expr) or - exists(ThrowExpr throw | throw.getExpr().getFullyConverted() = expr) or - exists(TemporaryObjectExpr temp | temp.getExpr() = expr) or + ) + or + exists(ReturnStmt returnStmt | + returnStmt.getExpr().getFullyConverted() = expr and + hasReturnValue(returnStmt.getEnclosingFunction()) + ) + or + exists(ConstructorFieldInit fieldInit | fieldInit.getExpr().getFullyConverted() = expr) + or + exists(NewExpr newExpr | newExpr.getInitializer().getFullyConverted() = expr) + or + exists(ThrowExpr throw | throw.getExpr().getFullyConverted() = expr) + or + exists(TemporaryObjectExpr temp | temp.getExpr() = expr) + or exists(LambdaExpression lambda | lambda.getInitializer().getFullyConverted() = expr) ) } or 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 index 048e8457c28..d8ec66a2ee7 100644 --- 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 @@ -473,8 +473,7 @@ class TranslatedReturnVoidExpressionStmt extends TranslatedReturnStmt { override Instruction getALastInstructionInternal() { if this.hasAnImplicitDestructorCall() - then - result = this.getChild(max(int id | exists(this.getChild(id)))).getALastInstruction() + then result = this.getChild(max(int id | exists(this.getChild(id)))).getALastInstruction() else result = this.getInstruction(OnlyInstructionTag()) }