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

Minors.

Browse Source
This commit is contained in:
Alexander Arlt 2022-08-19 16:12:23 +02:00
parent 1774de0b3f
commit 91e3b650f9
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libevmasm/Assembly.cpp
View File

@ -109,16 +109,14 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json)
std::string name = getOrDefault<std::string>(_json, "name", ""); std::string name = getOrDefault<std::string>(_json, "name", "");
solAssert(!name.empty()); solAssert(!name.empty());
int begin = get<int>(_json, "begin"); SourceLocation location;
int end = get<int>(_json, "end"); location.start = get<int>(_json, "begin");
location.end = get<int>(_json, "end");
int srcIndex = get<int>(_json, "source"); int srcIndex = get<int>(_json, "source");
size_t modifierDepth = static_cast<size_t>(getOrDefault<int>(_json, "modifierDepth", 0)); size_t modifierDepth = static_cast<size_t>(getOrDefault<int>(_json, "modifierDepth", 0));
std::string value = getOrDefault<std::string>(_json, "value", ""); std::string value = getOrDefault<std::string>(_json, "value", "");
std::string jumpType = getOrDefault<std::string>(_json, "jumpType", ""); std::string jumpType = getOrDefault<std::string>(_json, "jumpType", "");
SourceLocation location;
location.start = begin;
location.end = end;
auto updateUsedTags = [&](u256 const& data) { auto updateUsedTags = [&](u256 const& data) {
m_usedTags = max(m_usedTags, static_cast<unsigned>(data) + 1); m_usedTags = max(m_usedTags, static_cast<unsigned>(data) + 1);
@ -142,10 +140,9 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json)
AssemblyItem result(0); AssemblyItem result(0);
if (c_instructions.find(name) != c_instructions.end()) if (c_instructions.count(name))
{ {
AssemblyItem item{c_instructions.at(name), location}; AssemblyItem item{c_instructions.at(name), location};
item.m_modifierDepth = modifierDepth;
if (!jumpType.empty()) if (!jumpType.empty())
item.setJumpType(jumpType); item.setJumpType(jumpType);
result = item; result = item;
@ -154,42 +151,42 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json)
{ {
if (name == "PUSH") if (name == "PUSH")
{ {
AssemblyItem item{AssemblyItemType::Push, u256("0x" + value), location}; AssemblyItem item{AssemblyItemType::Push, u256("0x" + value)};
if (!jumpType.empty()) if (!jumpType.empty())
item.setJumpType(jumpType); item.setJumpType(jumpType);
result = item; result = item;
} }
else if (name == "PUSH [ErrorTag]") else if (name == "PUSH [ErrorTag]")
result = {AssemblyItemType::PushTag, 0, location}; result = {AssemblyItemType::PushTag, 0};
else if (name == "PUSH [tag]") else if (name == "PUSH [tag]")
result = {AssemblyItemType::PushTag, updateUsedTags(u256(value)), location}; result = {AssemblyItemType::PushTag, updateUsedTags(u256(value))};
else if (name == "PUSH [$]") else if (name == "PUSH [$]")
result = {AssemblyItemType::PushSub, u256("0x" + value), location}; result = {AssemblyItemType::PushSub, u256("0x" + value)};
else if (name == "PUSH #[$]") else if (name == "PUSH #[$]")
result = {AssemblyItemType::PushSubSize, u256("0x" + value), location}; result = {AssemblyItemType::PushSubSize, u256("0x" + value)};
else if (name == "PUSHSIZE") else if (name == "PUSHSIZE")
result = {AssemblyItemType::PushProgramSize, 0, location}; result = {AssemblyItemType::PushProgramSize, 0};
else if (name == "PUSHLIB") else if (name == "PUSHLIB")
result = {AssemblyItemType::PushLibraryAddress, libraryHash(value), location}; result = {AssemblyItemType::PushLibraryAddress, libraryHash(value)};
else if (name == "PUSHDEPLOYADDRESS") else if (name == "PUSHDEPLOYADDRESS")
result = {AssemblyItemType::PushDeployTimeAddress, 0, location}; result = {AssemblyItemType::PushDeployTimeAddress, 0};
else if (name == "PUSHIMMUTABLE") else if (name == "PUSHIMMUTABLE")
result = {AssemblyItemType::PushImmutable, immutableHash(value), location}; result = {AssemblyItemType::PushImmutable, immutableHash(value)};
else if (name == "ASSIGNIMMUTABLE") else if (name == "ASSIGNIMMUTABLE")
result = {AssemblyItemType::AssignImmutable, immutableHash(value), location}; result = {AssemblyItemType::AssignImmutable, immutableHash(value)};
else if (name == "tag") else if (name == "tag")
result = {AssemblyItemType::Tag, updateUsedTags(u256(value)), location}; result = {AssemblyItemType::Tag, updateUsedTags(u256(value))};
else if (name == "PUSH data") else if (name == "PUSH data")
result = {AssemblyItemType::PushData, u256("0x" + value), location}; result = {AssemblyItemType::PushData, u256("0x" + value)};
else if (name == "VERBATIM") else if (name == "VERBATIM")
{ {
AssemblyItem item(fromHex(value), 0, 0); AssemblyItem item(fromHex(value), 0, 0);
item.setLocation(location);
result = item; result = item;
} }
else else
assertThrow(false, InvalidOpcode, ""); assertThrow(false, InvalidOpcode, "");
} }
result.setLocation(location);
result.m_modifierDepth = modifierDepth; result.m_modifierDepth = modifierDepth;
return result; return result;
} }

1
libsolidity/interface/CompilerStack.cpp
View File

@ -242,6 +242,7 @@ void CompilerStack::setLibraries(std::map<std::string, util::h160> const& _libra
void CompilerStack::setOptimiserSettings(bool _optimize, size_t _runs) void CompilerStack::setOptimiserSettings(bool _optimize, size_t _runs)
{ {
OptimiserSettings settings = _optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal(); OptimiserSettings settings = _optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal();
settings.enabled = _optimize;
settings.expectedExecutionsPerDeployment = _runs; settings.expectedExecutionsPerDeployment = _runs;
setOptimiserSettings(std::move(settings)); setOptimiserSettings(std::move(settings));
} }

2
solc/CommandLineParser.cpp
View File

@ -279,8 +279,6 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
solAssert(settings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps); solAssert(settings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
} }
settings.enabled = optimizer.enabled;
return settings; return settings;
} }