cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use make_vector in EWasmCodeTransform.

Browse Source
This commit is contained in:
Daniel Kirchner 2019-05-17 14:13:43 +02:00
parent 88e9fbe671
commit 39670abe4d
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libyul/backends/wasm/EWasmCodeTransform.cpp
View File

@ -169,9 +169,10 @@ wasm::Expression EWasmCodeTransform::operator()(Switch const& _switch)
Case const& c = _switch.cases.at(i); Case const& c = _switch.cases.at(i);
if (c.value) if (c.value)
{ {
wasm::BuiltinCall comparison{"i64.eq", {}}; wasm::BuiltinCall comparison{"i64.eq", make_vector<wasm::Expression>(
comparison.arguments.emplace_back(wasm::LocalVariable{condition}); wasm::LocalVariable{condition},
comparison.arguments.emplace_back(visitReturnByValue(*c.value)); visitReturnByValue(*c.value)
)};
wasm::If ifStmnt{ wasm::If ifStmnt{
make_unique<wasm::Expression>(move(comparison)), make_unique<wasm::Expression>(move(comparison)),
visit(c.body.statements), visit(c.body.statements),
@ -207,24 +208,18 @@ wasm::Expression EWasmCodeTransform::operator()(ForLoop const& _for)
string continueLabel = newLabel(); string continueLabel = newLabel();
m_breakContinueLabelNames.push({breakLabel, continueLabel}); m_breakContinueLabelNames.push({breakLabel, continueLabel});
// The AST is constructed in this weird way because of some strange
// problem with move semantics.
wasm::BuiltinCall loopCondition{"i64.eqz", {}};
loopCondition.arguments.emplace_back(visitReturnByValue(*_for.condition));
wasm::BuiltinCall conditionCheck{"br_if", {}};
conditionCheck.arguments.emplace_back(wasm::Label{breakLabel});
conditionCheck.arguments.emplace_back(move(loopCondition));
wasm::Loop loop; wasm::Loop loop;
loop.statements = visit(_for.pre.statements); loop.statements = visit(_for.pre.statements);
loop.statements.emplace_back(move(conditionCheck)); loop.statements.emplace_back(wasm::BuiltinCall{"br_if", make_vector<wasm::Expression>(
wasm::Label{breakLabel},
wasm::BuiltinCall{"i64.eqz", make_vector<wasm::Expression>(
visitReturnByValue(*_for.condition)
)}
)});
loop.statements.emplace_back(wasm::Block{continueLabel, visit(_for.body.statements)}); loop.statements.emplace_back(wasm::Block{continueLabel, visit(_for.body.statements)});
loop.statements += visit(_for.post.statements); loop.statements += visit(_for.post.statements);
wasm::Block breakBlock{breakLabel, {}}; return { wasm::Block{breakLabel, make_vector<wasm::Expression>(move(loop))} };
breakBlock.statements.emplace_back(move(loop));
return { std::move(breakBlock) };
} }
wasm::Expression EWasmCodeTransform::operator()(Break const&) wasm::Expression EWasmCodeTransform::operator()(Break const&)