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

Undo second SSA transformation and add more tests.

Browse Source
This commit is contained in:
Daniel Kirchner
2019-01-17 20:37:43 +01:00
parent 6de2d92f20
commit fd16585724
15 changed files with 366 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/optimiser/SSAReverser.cpp
+60 -28
View File
@@ -29,42 +29,74 @@ void SSAReverser::operator()(Block& _block)
_block.statements,
[&](Statement& _stmt1, Statement& _stmt2) -> boost::optional<vector<Statement>>
{
auto* varDecl = boost::get<VariableDeclaration>(&_stmt1);
if (!varDecl || varDecl->variables.size() != 1 || !varDecl->value)
return {};
// Replaces
// let a_1 := E
// a := a_1
// with
// a := E
// let a_1 := a
auto* varDecl = boost::get<VariableDeclaration>(&_stmt1);
auto* assignment = boost::get<Assignment>(&_stmt2);
if (!varDecl || !assignment)
return {};
auto* identifier = boost::get<Identifier>(assignment->value.get());
if (
varDecl->variables.size() == 1 &&
varDecl->value &&
assignment->variableNames.size() == 1 &&
identifier &&
identifier->name == varDecl->variables.front().name
)
if (auto* assignment = boost::get<Assignment>(&_stmt2))
{
vector<Statement> result;
result.emplace_back(Assignment{
std::move(assignment->location),
assignment->variableNames,
std::move(varDecl->value)
});
result.emplace_back(VariableDeclaration{
std::move(varDecl->location),
std::move(varDecl->variables),
std::make_unique<Expression>(std::move(assignment->variableNames.front()))
});
return { std::move(result) };
auto* identifier = boost::get<Identifier>(assignment->value.get());
if (
assignment->variableNames.size() == 1 &&
identifier &&
identifier->name == varDecl->variables.front().name
)
{
vector<Statement> result;
result.emplace_back(Assignment{
std::move(assignment->location),
assignment->variableNames,
std::move(varDecl->value)
});
result.emplace_back(VariableDeclaration{
std::move(varDecl->location),
std::move(varDecl->variables),
std::make_unique<Expression>(std::move(assignment->variableNames.front()))
});
return { std::move(result) };
}
}
// Replaces
// let a_1 := E
// let a := a_1
// with
// let a := E
// let a_1 := a
else if (auto* varDecl2 = boost::get<VariableDeclaration>(&_stmt2))
{
auto* identifier = boost::get<Identifier>(varDecl2->value.get());
if (
varDecl2->variables.size() == 1 &&
identifier &&
identifier->name == varDecl->variables.front().name
)
{
vector<Statement> result;
auto varIdentifier2 = std::make_unique<Expression>(Identifier{
varDecl2->variables.front().location,
varDecl2->variables.front().name
});
result.emplace_back(VariableDeclaration{
std::move(varDecl2->location),
std::move(varDecl2->variables),
std::move(varDecl->value)
});
result.emplace_back(VariableDeclaration{
std::move(varDecl->location),
std::move(varDecl->variables),
std::move(varIdentifier2)
});
return { std::move(result) };
}
}
return {};
}
);