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

libevmasm/Assembly.cpp: minors.

Browse Source
This commit is contained in:
Alexander Arlt 2022-05-10 00:00:14 +02:00
parent 793adf46f7
commit 6c663ac56b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libevmasm/Assembly.cpp
View File

@ -76,6 +76,7 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
void Assembly::addAssemblyItemsFromJSON(Json::Value const& _code) void Assembly::addAssemblyItemsFromJSON(Json::Value const& _code)
{ {
solAssert(m_items.empty(), "");
solAssert(_code.isArray(), ""); solAssert(_code.isArray(), "");
for (auto const& jsonItem: _code) for (auto const& jsonItem: _code)
m_items.emplace_back(loadItemFromJSON(jsonItem)); m_items.emplace_back(loadItemFromJSON(jsonItem));
@ -106,28 +107,27 @@ AssemblyItem Assembly::loadItemFromJSON(Json::Value const& _json)
std::string jumpType = _json["jumpType"].isString() ? _json["jumpType"].asString() : ""; std::string jumpType = _json["jumpType"].isString() ? _json["jumpType"].asString() : "";
solAssert(!name.empty(), ""); solAssert(!name.empty(), "");
SourceLocation location;
location.start = begin;
location.end = end;
auto updateUsedTags = [&](u256 const& data) { auto updateUsedTags = [&](u256 const& data) {
auto tag = static_cast<unsigned>(data); m_usedTags = max(m_usedTags, static_cast<unsigned>(data) + 1);
if (m_usedTags <= tag)
m_usedTags = tag + 1;
return data; return data;
}; };
auto immutableHash = [&](string const& _immutableName) -> h256 { auto immutableHash = [&](string const& _immutableName) -> h256 {
h256 hash(util::keccak256(value)); h256 hash(util::keccak256(_immutableName));
m_immutables[hash] = _immutableName; m_immutables[hash] = _immutableName;
return hash; return hash;
}; };
auto libraryHash = [&](string const& _libraryName) -> h256 { auto libraryHash = [&](string const& _libraryName) -> h256 {
h256 hash(util::keccak256(value)); h256 hash(util::keccak256(_libraryName));
m_libraries[hash] = _libraryName; m_libraries[hash] = _libraryName;
return hash; return hash;
}; };
SourceLocation location;
location.start = begin;
location.end = end;
if (srcIndex > -1 && srcIndex < static_cast<int>(sources().size())) if (srcIndex > -1 && srcIndex < static_cast<int>(sources().size()))
location.sourceName = sources()[static_cast<size_t>(srcIndex)]; location.sourceName = sources()[static_cast<size_t>(srcIndex)];