diff options
| author | chriseth <c@ethdev.com> | 2015-04-27 22:51:01 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-27 22:51:01 +0800 |
| commit | ceb9326eb289fbd5f234f407aa940b973e4b60d0 (patch) | |
| tree | 2696c0d71951d865528143f9c73b5d69f392e117 /libsolidity | |
| parent | 21ced7e9c5123255dae9da0ba7a09e7545df6383 (diff) | |
| parent | cfe24c3c2a60d59c0075e82fed044232baec4974 (diff) | |
| download | dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.tar dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.tar.gz dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.tar.bz2 dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.tar.lz dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.tar.xz dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.tar.zst dexon-solidity-ceb9326eb289fbd5f234f407aa940b973e4b60d0.zip | |
Merge pull request #1740 from chriseth/sol_sourceLocationForOptimizer
Try to keep source location during optimisation.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/SolidityOptimizer.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libsolidity/SolidityOptimizer.cpp b/libsolidity/SolidityOptimizer.cpp index af9b5146..ceb9c68d 100644 --- a/libsolidity/SolidityOptimizer.cpp +++ b/libsolidity/SolidityOptimizer.cpp @@ -22,6 +22,7 @@ #include <string> #include <tuple> +#include <memory> #include <boost/test/unit_test.hpp> #include <boost/lexical_cast.hpp> #include <test/libsolidity/solidityExecutionFramework.h> @@ -84,9 +85,20 @@ public: AssemblyItems getCSE(AssemblyItems const& _input) { + // add dummy locations to each item so that we can check that they are not deleted + AssemblyItems input = _input; + for (AssemblyItem& item: input) + item.setLocation(SourceLocation(1, 3, make_shared<string>(""))); + eth::CommonSubexpressionEliminator cse; - BOOST_REQUIRE(cse.feedItems(_input.begin(), _input.end()) == _input.end()); - return cse.getOptimizedItems(); + BOOST_REQUIRE(cse.feedItems(input.begin(), input.end()) == input.end()); + AssemblyItems output = cse.getOptimizedItems(); + + for (AssemblyItem const& item: output) + { + BOOST_CHECK(item == Instruction::POP || !item.getLocation().isEmpty()); + } + return output; } void checkCSE(AssemblyItems const& _input, AssemblyItems const& _expectation) |