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

ref wrapper

Browse Source
This commit is contained in:
chriseth 2022-11-09 16:28:50 +01:00
parent 7950c2d82c
commit eaf5fc95f8
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libyul/optimiser/BlockHasher.h
View File

@ -134,4 +134,12 @@ public:
void operator()(FunctionCall const& _funCall) override; void operator()(FunctionCall const& _funCall) override;
}; };
struct ExpressionHash
{
uint64_t operator()(Expression const& _expression) const
{
return ExpressionHasher{}.run(_expression);
}
};
} }

17
libyul/optimiser/CommonSubexpressionEliminator.cpp
View File

@ -105,11 +105,8 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
_e = Identifier{debugDataOf(_e), value->name}; _e = Identifier{debugDataOf(_e), value->name};
} }
} }
else if ( else if (auto const* candidates = util::valueOrNullptr(m_replacementCandidates, _e))
auto it = m_replacementCandidates.find(&_e); for (auto const& variable: *candidates)
it != m_replacementCandidates.end()
)
for (auto const& variable: it->second)
if (AssignedValue const* value = variableValue(variable)) if (AssignedValue const* value = variableValue(variable))
{ {
assertThrow(value->value, OptimizerException, ""); assertThrow(value->value, OptimizerException, "");
@ -133,16 +130,16 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
void CommonSubexpressionEliminator::assignValue(YulString _variable, Expression const* _value) void CommonSubexpressionEliminator::assignValue(YulString _variable, Expression const* _value)
{ {
if (_value) if (_value)
m_replacementCandidates[_value].insert(_variable); m_replacementCandidates[*_value].insert(_variable);
DataFlowAnalyzer::assignValue(_variable, _value); DataFlowAnalyzer::assignValue(_variable, _value);
} }
uint64_t CommonSubexpressionEliminator::ExpressionHash::operator()(Expression const* _e) const uint64_t CommonSubexpressionEliminator::ExpressionHash::operator()(Expression const& _e) const
{ {
return ExpressionHasher::run(*_e); return ExpressionHasher::run(_e);
} }
bool CommonSubexpressionEliminator::ExpressionEqual::operator()(Expression const* _a, Expression const* _b) const bool CommonSubexpressionEliminator::ExpressionEqual::operator()(Expression const& _a, Expression const& _b) const
{ {
return SyntacticallyEqual{}(*_a, *_b); return SyntacticallyEqual{}(_a, _b);
} }

6
libyul/optimiser/CommonSubexpressionEliminator.h
View File

@ -61,14 +61,14 @@ protected:
void assignValue(YulString _variable, Expression const* _value) override; void assignValue(YulString _variable, Expression const* _value) override;
private: private:
struct ExpressionHash { struct ExpressionHash {
uint64_t operator()(Expression const*) const; uint64_t operator()(Expression const&) const;
}; };
struct ExpressionEqual { struct ExpressionEqual {
bool operator()(Expression const*, Expression const*) const; bool operator()(Expression const&, Expression const&) const;
}; };
std::set<YulString> m_returnVariables; std::set<YulString> m_returnVariables;
std::unordered_map< std::unordered_map<
Expression const*, std::reference_wrapper<Expression const>,
std::set<YulString>, std::set<YulString>,
ExpressionHash, ExpressionHash,
ExpressionEqual ExpressionEqual