1
0
Fork 0
forked from suyu/suyu

control_flow: Make use of std::move in InsertBranch()

Avoids unnecessary atomic increments and decrements.
This commit is contained in:
Lioncash 2020-09-22 22:48:06 -04:00
parent 2b863c9aa3
commit fcd0145eb5

View file

@ -580,8 +580,8 @@ bool TryQuery(CFGRebuildState& state) {
} }
void InsertBranch(ASTManager& mm, const BlockBranchInfo& branch_info) { void InsertBranch(ASTManager& mm, const BlockBranchInfo& branch_info) {
const auto get_expr = ([&](const Condition& cond) -> Expr { const auto get_expr = [](const Condition& cond) -> Expr {
Expr result{}; Expr result;
if (cond.cc != ConditionCode::T) { if (cond.cc != ConditionCode::T) {
result = MakeExpr<ExprCondCode>(cond.cc); result = MakeExpr<ExprCondCode>(cond.cc);
} }
@ -594,10 +594,10 @@ void InsertBranch(ASTManager& mm, const BlockBranchInfo& branch_info) {
} }
Expr extra = MakeExpr<ExprPredicate>(pred); Expr extra = MakeExpr<ExprPredicate>(pred);
if (negate) { if (negate) {
extra = MakeExpr<ExprNot>(extra); extra = MakeExpr<ExprNot>(std::move(extra));
} }
if (result) { if (result) {
return MakeExpr<ExprAnd>(extra, result); return MakeExpr<ExprAnd>(std::move(extra), std::move(result));
} }
return extra; return extra;
} }
@ -605,9 +605,10 @@ void InsertBranch(ASTManager& mm, const BlockBranchInfo& branch_info) {
return result; return result;
} }
return MakeExpr<ExprBoolean>(true); return MakeExpr<ExprBoolean>(true);
}); };
if (std::holds_alternative<SingleBranch>(*branch_info)) { if (std::holds_alternative<SingleBranch>(*branch_info)) {
const auto branch = std::get_if<SingleBranch>(branch_info.get()); const auto* branch = std::get_if<SingleBranch>(branch_info.get());
if (branch->address < 0) { if (branch->address < 0) {
if (branch->kill) { if (branch->kill) {
mm.InsertReturn(get_expr(branch->condition), true); mm.InsertReturn(get_expr(branch->condition), true);
@ -619,7 +620,7 @@ void InsertBranch(ASTManager& mm, const BlockBranchInfo& branch_info) {
mm.InsertGoto(get_expr(branch->condition), branch->address); mm.InsertGoto(get_expr(branch->condition), branch->address);
return; return;
} }
const auto multi_branch = std::get_if<MultiBranch>(branch_info.get()); const auto* multi_branch = std::get_if<MultiBranch>(branch_info.get());
for (const auto& branch_case : multi_branch->branches) { for (const auto& branch_case : multi_branch->branches) {
mm.InsertGoto(MakeExpr<ExprGprEqual>(multi_branch->gpr, branch_case.cmp_value), mm.InsertGoto(MakeExpr<ExprGprEqual>(multi_branch->gpr, branch_case.cmp_value),
branch_case.address); branch_case.address);