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

Merge pull request #3472 from ethereum/removeemptyblocks

Browse Source 
Use removeEmptyBlocks helper in FunctionHoister
This commit is contained in:
chriseth 2018-02-09 10:24:40 +01:00 committed by GitHub
commit 2095e7a32d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjulia/optimiser/FunctionHoister.cpp
View File

@ -21,6 +21,7 @@
*/ */
#include <libjulia/optimiser/FunctionHoister.h> #include <libjulia/optimiser/FunctionHoister.h>
#include <libjulia/optimiser/Utilities.h>
#include <libsolidity/inlineasm/AsmData.h> #include <libsolidity/inlineasm/AsmData.h>
@ -28,14 +29,11 @@
#include <libdevcore/CommonData.h> #include <libdevcore/CommonData.h>
#include <boost/range/algorithm_ext/erase.hpp>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace dev::julia; using namespace dev::julia;
using namespace dev::solidity; using namespace dev::solidity;
void FunctionHoister::operator()(Block& _block) void FunctionHoister::operator()(Block& _block)
{ {
bool topLevel = m_isTopLevel; bool topLevel = m_isTopLevel;
@ -49,11 +47,7 @@ void FunctionHoister::operator()(Block& _block)
statement = Block{_block.location, {}}; statement = Block{_block.location, {}};
} }
} }
auto isEmptyBlock = [](Statement const& _st) -> bool { removeEmptyBlocks(_block);
return _st.type() == typeid(Block) && boost::get<Block>(_st).statements.empty();
};
// Remove empty blocks
boost::range::remove_erase_if(_block.statements, isEmptyBlock);
if (topLevel) if (topLevel)
_block.statements += std::move(m_functions); _block.statements += std::move(m_functions);
} }