cerc-io/solidity
11
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

Rename "enabled" optimizer setting stage to "standard".

Browse Source
This commit is contained in:
chriseth
2019-03-21 11:04:40 +01:00
parent 51ae865b96
commit d381e26fc8
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/interface/CompilerStack.cpp
+2 -2
View File
@@ -109,7 +109,7 @@ void CompilerStack::setLibraries(std::map<std::string, h160> const& _libraries)
void CompilerStack::setOptimiserSettings(bool _optimize, unsigned _runs)
{
OptimiserSettings settings = _optimize ? OptimiserSettings::enabled() : OptimiserSettings::minimal();
OptimiserSettings settings = _optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal();
settings.expectedExecutionsPerDeployment = _runs;
setOptimiserSettings(std::move(settings));
}
@@ -978,7 +978,7 @@ string CompilerStack::createMetadata(Contract const& _contract) const
settingsWithoutRuns.expectedExecutionsPerDeployment = OptimiserSettings::minimal().expectedExecutionsPerDeployment;
if (settingsWithoutRuns == OptimiserSettings::minimal())
meta["settings"]["optimizer"]["enabled"] = false;
else if (settingsWithoutRuns == OptimiserSettings::enabled())
else if (settingsWithoutRuns == OptimiserSettings::standard())
meta["settings"]["optimizer"]["enabled"] = true;
else
{
libsolidity/interface/OptimiserSettings.h
+2 -2
View File
@@ -45,7 +45,7 @@ struct OptimiserSettings
return s;
}
/// Standard optimisations.
static OptimiserSettings enabled()
static OptimiserSettings standard()
{
OptimiserSettings s;
s.runOrderLiterals = true;
@@ -63,7 +63,7 @@ struct OptimiserSettings
/// Standard optimisations plus yul and stack optimiser.
static OptimiserSettings full()
{
OptimiserSettings s = enabled();
OptimiserSettings s = standard();
s.optimizeStackAllocation = true;
s.runYulOptimiser = true;
return s;
libsolidity/interface/StandardCompiler.cpp
+1 -1
View File
@@ -369,7 +369,7 @@ boost::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Valu
if (!_jsonInput["enabled"].isBool())
return formatFatalError("JSONError", "The \"enabled\" setting must be a Boolean.");
settings = _jsonInput["enabled"].asBool() ? OptimiserSettings::enabled() : OptimiserSettings::minimal();
settings = _jsonInput["enabled"].asBool() ? OptimiserSettings::standard() : OptimiserSettings::minimal();
}
if (_jsonInput.isMember("runs"))