fixup! [libevmasm] Add support to import evm assembly json.

Author: cameel

libevmasm/Assembly.cpp

@@ -52,6 +52,8 @@ using namespace solidity::evmasm;
 using namespace solidity::langutil;
 using namespace solidity::util;
 
+std::map<std::string, std::shared_ptr<std::string const>> Assembly::s_sharedSourceNames;
+
 AssemblyItem const& Assembly::append(AssemblyItem _i)
 {
 	assertThrow(m_deposit >= 0, AssemblyException, "Stack underflow.");
@@ -171,12 +173,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 
 	solRequire(srcIndex >= -1 && srcIndex < static_cast<int>(_sourceList.size()), AssemblyImportException, "Source index out of bounds.");
 	if (srcIndex != -1)
-	{
-		static std::map<std::string, std::shared_ptr<std::string const>> sharedSourceNames;
-		if (sharedSourceNames.find(_sourceList[static_cast<size_t>(srcIndex)]) == sharedSourceNames.end())
-			sharedSourceNames[_sourceList[static_cast<size_t>(srcIndex)]] = std::make_shared<std::string>(_sourceList[static_cast<size_t>(srcIndex)]);
-		location.sourceName = sharedSourceNames[_sourceList[static_cast<size_t>(srcIndex)]];
-	}
+		location.sourceName = sharedSourceName(_sourceList[static_cast<size_t>(srcIndex)]);
 
 	AssemblyItem result(0);
 
@@ -637,6 +634,14 @@ void Assembly::encodeAllPossibleSubPathsInAssemblyTree(std::vector<size_t> _path
 	}
 }
 
+std::shared_ptr<std::string const> Assembly::sharedSourceName(std::string const& _name) const
+{
+	if (s_sharedSourceNames.find(_name) == s_sharedSourceNames.end())
+		s_sharedSourceNames[_name] = std::make_shared<std::string>(_name);
+
+	return s_sharedSourceNames[_name];
+}
+
 AssemblyItem Assembly::namedTag(std::string const& _name, size_t _params, size_t _returns, std::optional<uint64_t> _sourceID)
 {
 	assertThrow(!_name.empty(), AssemblyException, "Empty named tag.");

libevmasm/Assembly.h

@@ -203,6 +203,8 @@ class Assembly
 
 	void encodeAllPossibleSubPathsInAssemblyTree(std::vector<size_t> _pathFromRoot = {}, std::vector<Assembly*> _assembliesOnPath = {});
 
+	std::shared_ptr<std::string const> sharedSourceName(std::string const& _name) const;
+
 protected:
 	/// 0 is reserved for exception
 	unsigned m_usedTags = 1;
@@ -246,6 +248,9 @@ class Assembly
 	std::string m_name;
 	langutil::SourceLocation m_currentSourceLocation;
 
+	// FIXME: This being static means that the strings won't be freed when they're no longer needed
+	static std::map<std::string, std::shared_ptr<std::string const>> s_sharedSourceNames;
+
 public:
 	size_t m_currentModifierDepth = 0;
 };