From 851dd635eb2b34037be34489d439cefb65e28910 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 28 Feb 2019 16:05:20 +0100 Subject: [PATCH] Remove defaults in constructor arguments. --- libevmasm/Assembly.h | 2 +- liblll/Compiler.cpp | 4 ++-- libsolidity/codegen/CompilerContext.h | 2 +- libsolidity/codegen/ContractCompiler.h | 6 +++++- libsolidity/codegen/ExpressionCompiler.h | 2 +- test/libevmasm/Optimiser.cpp | 2 +- test/libsolidity/SolidityExpressionCompiler.cpp | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h index b21077e28..a53c92420 100644 --- a/libevmasm/Assembly.h +++ b/libevmasm/Assembly.h @@ -122,7 +122,7 @@ public: /// @a _runs specifes an estimate on how often each opcode in this assembly will be executed, /// i.e. use a small value to optimise for size and a large value to optimise for runtime. /// If @a _enable is not set, will perform some simple peephole optimizations. - Assembly& optimise(bool _enable, langutil::EVMVersion _evmVersion, bool _isCreation = true, size_t _runs = 200); + Assembly& optimise(bool _enable, langutil::EVMVersion _evmVersion, bool _isCreation, size_t _runs); /// Create a text representation of the assembly. std::string assemblyString( diff --git a/liblll/Compiler.cpp b/liblll/Compiler.cpp index 065ffb32a..03190347a 100644 --- a/liblll/Compiler.cpp +++ b/liblll/Compiler.cpp @@ -36,7 +36,7 @@ bytes dev::lll::compileLLL(string const& _src, langutil::EVMVersion _evmVersion, cs.populateStandard(); auto assembly = CodeFragment::compile(_src, cs, _readFile).assembly(cs); if (_opt) - assembly = assembly.optimise(true, _evmVersion); + assembly = assembly.optimise(true, _evmVersion, true, 200); bytes ret = assembly.assemble().bytecode; for (auto i: cs.treesToKill) killBigints(i); @@ -74,7 +74,7 @@ std::string dev::lll::compileLLLToAsm(std::string const& _src, langutil::EVMVers cs.populateStandard(); auto assembly = CodeFragment::compile(_src, cs, _readFile).assembly(cs); if (_opt) - assembly = assembly.optimise(true, _evmVersion); + assembly = assembly.optimise(true, _evmVersion, true, 200); string ret = assembly.assemblyString(); for (auto i: cs.treesToKill) killBigints(i); diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h index 0957287a1..44f96f5dd 100644 --- a/libsolidity/codegen/CompilerContext.h +++ b/libsolidity/codegen/CompilerContext.h @@ -52,7 +52,7 @@ class Compiler; class CompilerContext { public: - explicit CompilerContext(langutil::EVMVersion _evmVersion = langutil::EVMVersion{}, CompilerContext* _runtimeContext = nullptr): + explicit CompilerContext(langutil::EVMVersion _evmVersion, CompilerContext* _runtimeContext = nullptr): m_asm(std::make_shared()), m_evmVersion(_evmVersion), m_runtimeContext(_runtimeContext), diff --git a/libsolidity/codegen/ContractCompiler.h b/libsolidity/codegen/ContractCompiler.h index b6d391e2b..30a841334 100644 --- a/libsolidity/codegen/ContractCompiler.h +++ b/libsolidity/codegen/ContractCompiler.h @@ -40,7 +40,11 @@ namespace solidity class ContractCompiler: private ASTConstVisitor { public: - explicit ContractCompiler(ContractCompiler* _runtimeCompiler, CompilerContext& _context, OptimiserSettings _optimiserSettings): + explicit ContractCompiler( + ContractCompiler* _runtimeCompiler, + CompilerContext& _context, + OptimiserSettings _optimiserSettings + ): m_optimiserSettings(std::move(_optimiserSettings)), m_runtimeCompiler(_runtimeCompiler), m_context(_context) diff --git a/libsolidity/codegen/ExpressionCompiler.h b/libsolidity/codegen/ExpressionCompiler.h index 615636d74..ca4e05b5f 100644 --- a/libsolidity/codegen/ExpressionCompiler.h +++ b/libsolidity/codegen/ExpressionCompiler.h @@ -55,7 +55,7 @@ class ArrayType; class ExpressionCompiler: private ASTConstVisitor { public: - explicit ExpressionCompiler(CompilerContext& _compilerContext, bool _optimiseOrderLiterals = false): + explicit ExpressionCompiler(CompilerContext& _compilerContext, bool _optimiseOrderLiterals): m_optimiseOrderLiterals(_optimiseOrderLiterals), m_context(_compilerContext) {} /// Compile the given @a _expression and leave its value on the stack. diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp index c65d28d3e..188aa56a7 100644 --- a/test/libevmasm/Optimiser.cpp +++ b/test/libevmasm/Optimiser.cpp @@ -1053,7 +1053,7 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies) main.append(t1.toSubAssemblyTag(subId)); main.append(u256(8)); - main.optimise(true, dev::test::Options::get().evmVersion()); + main.optimise(true, dev::test::Options::get().evmVersion(), false, 200); AssemblyItems expectationMain{ AssemblyItem(PushSubSize, 0), diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp index f5c4dc5ed..b079b013a 100644 --- a/test/libsolidity/SolidityExpressionCompiler.cpp +++ b/test/libsolidity/SolidityExpressionCompiler.cpp @@ -153,7 +153,7 @@ bytes compileFirstExpression( parametersSize-- ); - ExpressionCompiler(context).compile(*extractor.expression()); + ExpressionCompiler(context, dev::test::Options::get().optimize).compile(*extractor.expression()); for (vector const& function: _functions) context << context.functionEntryLabel(dynamic_cast(