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

syn eq

Browse Source
This commit is contained in:
chriseth 2022-11-09 16:34:06 +01:00
parent ad33e295bb
commit 8c18193e82
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libyul/optimiser/CommonSubexpressionEliminator.cpp
View File

@ -133,8 +133,3 @@ void CommonSubexpressionEliminator::assignValue(YulString _variable, Expression
m_replacementCandidates[*_value].insert(_variable); m_replacementCandidates[*_value].insert(_variable);
DataFlowAnalyzer::assignValue(_variable, _value); DataFlowAnalyzer::assignValue(_variable, _value);
} }
bool CommonSubexpressionEliminator::ExpressionEqual::operator()(Expression const& _a, Expression const& _b) const
{
return SyntacticallyEqual{}(_a, _b);
}

6
libyul/optimiser/CommonSubexpressionEliminator.h
View File

@ -24,6 +24,7 @@
#include <libyul/optimiser/DataFlowAnalyzer.h> #include <libyul/optimiser/DataFlowAnalyzer.h>
#include <libyul/optimiser/OptimiserStep.h> #include <libyul/optimiser/OptimiserStep.h>
#include <libyul/optimiser/SyntacticalEquality.h>
#include <libyul/optimiser/BlockHasher.h> #include <libyul/optimiser/BlockHasher.h>
#include <set> #include <set>
@ -61,15 +62,12 @@ protected:
void assignValue(YulString _variable, Expression const* _value) override; void assignValue(YulString _variable, Expression const* _value) override;
private: private:
struct ExpressionEqual {
bool operator()(Expression const&, Expression const&) const;
};
std::set<YulString> m_returnVariables; std::set<YulString> m_returnVariables;
std::unordered_map< std::unordered_map<
std::reference_wrapper<Expression const>, std::reference_wrapper<Expression const>,
std::set<YulString>, std::set<YulString>,
ExpressionHash, ExpressionHash,
ExpressionEqual SyntacticallyEqualCallable
> m_replacementCandidates; > m_replacementCandidates;
}; };

19
libyul/optimiser/SyntacticalEquality.h
View File

@ -85,4 +85,23 @@ private:
std::map<YulString, std::size_t> m_identifiersRHS; std::map<YulString, std::size_t> m_identifiersRHS;
}; };
/**
* Does the same as SyntacticallyEqual just that the operator() function is const.
*/
struct SyntacticallyEqualCallable
{
bool operator()(Expression const& _lhs, Expression const& _rhs) const
{
(void)_lhs;
(void)_rhs;
return true;//SyntacticallyEqual{}(_lhs, _rhs);
}
// bool operator()(Statement const& _lhs, Statement const& _rhs) const
// {
// (void)_lhs;
// (void)_rhs;
// return true;//SyntacticallyEqual{}(_lhs, _rhs);
// }
};
} }