diff options
| -rw-r--r-- | libevmasm/Assembly.cpp | 9 | ||||
| -rw-r--r-- | libevmasm/Instruction.cpp | 1 | ||||
| -rw-r--r-- | liblll/CodeFragment.cpp | 1 | ||||
| -rw-r--r-- | libsolidity/ast/Types.h | 1 | ||||
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 1 | ||||
| -rw-r--r-- | libsolidity/parsing/Scanner.h | 1 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 1 | ||||
| -rw-r--r-- | test/libsolidity/Assembly.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/InlineAssembly.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExpressionCompiler.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityParser.cpp | 1 |
12 files changed, 1 insertions, 19 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index 7277865e..7f7e1b9c 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -21,7 +21,6 @@ #include "Assembly.h" #include <fstream> -#include <libdevcore/Log.h> #include <libevmasm/CommonSubexpressionEliminator.h> #include <libevmasm/ControlFlowGraph.h> #include <libevmasm/BlockDeduplicator.h> @@ -307,9 +306,6 @@ void Assembly::injectStart(AssemblyItem const& _i) m_items.insert(m_items.begin(), _i); } -struct OptimiserChannel: public LogChannel { static const char* name() { return "OPT"; } static const int verbosity = 12; }; -#define copt dev::LogOutputStream<OptimiserChannel, true>() - Assembly& Assembly::optimise(bool _enable, bool _isCreation, size_t _runs) { if (!_enable) @@ -318,10 +314,8 @@ Assembly& Assembly::optimise(bool _enable, bool _isCreation, size_t _runs) unsigned total = 0; for (unsigned count = 1; count > 0; total += count) { - copt << toString(*this); count = 0; - copt << "Performing optimisation..."; // This only modifies PushTags, we have to run again to actually remove code. BlockDeduplicator dedup(m_items); if (dedup.deduplicate()) @@ -360,7 +354,6 @@ Assembly& Assembly::optimise(bool _enable, bool _isCreation, size_t _runs) if (shouldReplace) { - copt << "Old size: " << (iter - orig) << ", new size: " << optimisedChunk.size(); count++; optimisedItems += optimisedChunk; } @@ -384,8 +377,6 @@ Assembly& Assembly::optimise(bool _enable, bool _isCreation, size_t _runs) m_items ); - copt << total << " optimisations done."; - for (auto& sub: m_subs) sub.optimise(true, false, _runs); diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index da765c41..d854dfec 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -24,7 +24,6 @@ #include <functional> #include <libdevcore/Common.h> #include <libdevcore/CommonIO.h> -#include <libdevcore/Log.h> using namespace std; using namespace dev; using namespace dev::solidity; diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp index 7998a5b5..e9f86ba0 100644 --- a/liblll/CodeFragment.cpp +++ b/liblll/CodeFragment.cpp @@ -28,7 +28,6 @@ #include <boost/spirit/include/support_utree.hpp> #pragma warning(pop) #pragma GCC diagnostic pop -#include <libdevcore/Log.h> #include <libdevcore/CommonIO.h> #include <libevmasm/Instruction.h> #include "CompilerState.h" diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index 1d65aeb6..d42bb5dd 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -27,6 +27,7 @@ #include <map> #include <boost/noncopyable.hpp> #include <libdevcore/Common.h> +#include <libdevcore/CommonIO.h> #include <libsolidity/interface/Exceptions.h> #include <libsolidity/ast/ASTForward.h> #include <libsolidity/parsing/Token.h> diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index bb50f47f..b8f72238 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -22,7 +22,6 @@ #include <ctype.h> #include <vector> -#include <libdevcore/Log.h> #include <libevmasm/SourceLocation.h> #include <libsolidity/parsing/Parser.h> #include <libsolidity/parsing/Scanner.h> diff --git a/libsolidity/parsing/Scanner.h b/libsolidity/parsing/Scanner.h index ac9f18e8..cd60aff8 100644 --- a/libsolidity/parsing/Scanner.h +++ b/libsolidity/parsing/Scanner.h @@ -53,7 +53,6 @@ #pragma once #include <libdevcore/Common.h> -#include <libdevcore/Log.h> #include <libdevcore/CommonData.h> #include <libevmasm/SourceLocation.h> #include <libsolidity/parsing/Token.h> diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 76c274bb..f28df8bf 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -43,7 +43,6 @@ #pragma once #include <libdevcore/Common.h> -#include <libdevcore/Log.h> #include <libsolidity/interface/Utils.h> #include <libsolidity/interface/Exceptions.h> #include <libdevcore/UndefMacros.h> diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp index 13665a33..557d496a 100644 --- a/test/libsolidity/Assembly.cpp +++ b/test/libsolidity/Assembly.cpp @@ -23,7 +23,6 @@ #include <string> #include <iostream> #include <boost/test/unit_test.hpp> -#include <libdevcore/Log.h> #include <libevmasm/SourceLocation.h> #include <libevmasm/Assembly.h> #include <libsolidity/parsing/Scanner.h> diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp index 779fc3f8..8d1a1d6c 100644 --- a/test/libsolidity/InlineAssembly.cpp +++ b/test/libsolidity/InlineAssembly.cpp @@ -22,7 +22,6 @@ #include <string> #include <memory> -#include <libdevcore/Log.h> #include <libevmasm/Assembly.h> #include <libsolidity/parsing/Scanner.h> #include <libsolidity/inlineasm/AsmStack.h> diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp index a201604b..398ac24f 100644 --- a/test/libsolidity/SolidityExpressionCompiler.cpp +++ b/test/libsolidity/SolidityExpressionCompiler.cpp @@ -22,7 +22,6 @@ #include <string> -#include <libdevcore/Log.h> #include <libsolidity/parsing/Scanner.h> #include <libsolidity/parsing/Parser.h> #include <libsolidity/analysis/NameAndTypeResolver.h> diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 684731e8..b6e21d0f 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -22,7 +22,6 @@ #include <string> -#include <libdevcore/Log.h> #include <libdevcore/SHA3.h> #include <libsolidity/parsing/Scanner.h> #include <libsolidity/parsing/Parser.h> diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index 2a7e82a7..e43b026c 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -22,7 +22,6 @@ #include <string> #include <memory> -#include <libdevcore/Log.h> #include <libsolidity/parsing/Scanner.h> #include <libsolidity/parsing/Parser.h> #include <libsolidity/interface/Exceptions.h> |