summaryrefslogtreecommitdiff
path: root/lang/c/pseudoc.cpp
diff options
context:
space:
mode:
authorMark Rowe <mark@vector35.com>2025-12-19 11:12:20 -0800
committerMark Rowe <mark@vector35.com>2025-12-20 21:34:49 -0800
commited0f3b1b8593f6b76fbb64c53a0885073c1c1979 (patch)
tree5d22d77ccea8bffc0619a32ed886d79d14daccf1 /lang/c/pseudoc.cpp
parentba13f6ec7d0ce9a18a03a1c895fb72d18e03014a (diff)
Fix many of the warnings that show up when compiling with GCC 15.2
Diffstat (limited to 'lang/c/pseudoc.cpp')
-rw-r--r--lang/c/pseudoc.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/lang/c/pseudoc.cpp b/lang/c/pseudoc.cpp
index 48763804..5a67eb40 100644
--- a/lang/c/pseudoc.cpp
+++ b/lang/c/pseudoc.cpp
@@ -430,27 +430,27 @@ PseudoCFunction::FieldDisplayType PseudoCFunction::GetFieldDisplayType(
std::optional<PseudoCFunction::TernaryInfo> PseudoCFunction::CanSimplifyToTernary(const BinaryNinja::HighLevelILInstruction &instr) const
{
- // Only handle if-statements
- if (instr.operation != HLIL_IF)
- return std::nullopt;
+ // Only handle if-statements
+ if (instr.operation != HLIL_IF)
+ return std::nullopt;
- auto conditionExpr = instr.GetConditionExpr<HLIL_IF>();
- auto trueExpr = instr.GetTrueExpr<HLIL_IF>();
- auto falseExpr = instr.GetFalseExpr<HLIL_IF>();
+ auto conditionExpr = instr.GetConditionExpr<HLIL_IF>();
+ auto trueExpr = instr.GetTrueExpr<HLIL_IF>();
+ auto falseExpr = instr.GetFalseExpr<HLIL_IF>();
if (GetHighLevelILFunction()->HasSideEffects(conditionExpr))
return std::nullopt;
- // Both branches must be assignment operations
- if (trueExpr.operation != HLIL_ASSIGN || falseExpr.operation != HLIL_ASSIGN)
- return std::nullopt;
+ // Both branches must be assignment operations
+ if (trueExpr.operation != HLIL_ASSIGN || falseExpr.operation != HLIL_ASSIGN)
+ return std::nullopt;
- // Get the destination expressions of the assignments
- auto trueDestExpr = trueExpr.GetDestExpr<HLIL_ASSIGN>();
- auto falseDestExpr = falseExpr.GetDestExpr<HLIL_ASSIGN>();
+ // Get the destination expressions of the assignments
+ auto trueDestExpr = trueExpr.GetDestExpr<HLIL_ASSIGN>();
+ auto falseDestExpr = falseExpr.GetDestExpr<HLIL_ASSIGN>();
- // Verify that the destination expressions are variable references
- if (trueDestExpr.operation != HLIL_VAR || falseDestExpr.operation != HLIL_VAR)
- return std::nullopt;
+ // Verify that the destination expressions are variable references
+ if (trueDestExpr.operation != HLIL_VAR || falseDestExpr.operation != HLIL_VAR)
+ return std::nullopt;
auto trueExprDestExpr = trueExpr.GetDestExpr<HLIL_ASSIGN>();
auto falseExprDestExpr = falseExpr.GetDestExpr<HLIL_ASSIGN>();
@@ -467,22 +467,22 @@ std::optional<PseudoCFunction::TernaryInfo> PseudoCFunction::CanSimplifyToTernar
if (GetHighLevelILFunction()->HasSideEffects(trueExprSourceExpr) || GetHighLevelILFunction()->HasSideEffects(falseExprSourceExpr))
return std::nullopt;
- // Avoid folding for "else if" cases
- for (auto parent = instr; parent.HasParent(); parent = parent.GetParent())
- {
- if (parent.operation != HLIL_IF)
- break;
- auto parentFalse = parent.GetFalseExpr<HLIL_IF>();
- if (parentFalse.operation == HLIL_IF)
- return std::nullopt;
- }
+ // Avoid folding for "else if" cases
+ for (auto parent = instr; parent.HasParent(); parent = parent.GetParent())
+ {
+ if (parent.operation != HLIL_IF)
+ break;
+ auto parentFalse = parent.GetFalseExpr<HLIL_IF>();
+ if (parentFalse.operation == HLIL_IF)
+ return std::nullopt;
+ }
- TernaryInfo info;
- info.conditional = conditionExpr;
- info.assignDest = trueDestExpr;
- info.trueAssign = trueExprSourceExpr;
- info.falseAssign = falseExprSourceExpr;
- return info;
+ TernaryInfo info;
+ info.conditional = conditionExpr;
+ info.assignDest = trueDestExpr;
+ info.trueAssign = trueExprSourceExpr;
+ info.falseAssign = falseExprSourceExpr;
+ return info;
}
bool PseudoCFunction::TryEmitSimplifiedTernary(