cerc-io/solidity
16
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

Merge pull request #6782 from ethereum/makeVectorEWasmCodeTransform

Browse Source 
Use make_vector in EWasmCodeTransform.
This commit is contained in:
chriseth 2019-05-20 13:07:56 +02:00 committed by GitHub
commit 0731abd3f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
if (c.value)
{
wasm::BuiltinCall comparison{"i64.eq", {}};
comparison.arguments.emplace_back(wasm::LocalVariable{condition});
comparison.arguments.emplace_back(visitReturnByValue(*c.value));
wasm::BuiltinCall comparison{"i64.eq", make_vector<wasm::Expression>(
wasm::LocalVariable{condition},
visitReturnByValue(*c.value)
)};
wasm::If ifStmnt{
make_unique<wasm::Expression>(move(comparison)),
visit(c.body.statements),
@ -207,24 +208,18 @@ wasm::Expression EWasmCodeTransform::operator()(ForLoop const& _for)
string continueLabel = newLabel();
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;
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 += visit(_for.post.statements);
wasm::Block breakBlock{breakLabel, {}};
breakBlock.statements.emplace_back(move(loop));
return { std::move(breakBlock) };
return { wasm::Block{breakLabel, make_vector<wasm::Expression>(move(loop))} };
}
wasm::Expression EWasmCodeTransform::operator()(Break const&)