Remove yulUtilityFileName

Author: r0qs

libevmasm/EVMAssemblyStack.cpp

@@ -22,6 +22,9 @@
 #include <liblangutil/Exceptions.h>
 #include <libsolidity/codegen/CompilerContext.h>
 
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/transform.hpp>
+
 #include <tuple>
 
 using namespace solidity::util;
@@ -73,12 +76,10 @@ LinkerObject const& EVMAssemblyStack::runtimeObject(std::string const& _contract
 std::map<std::string, unsigned> EVMAssemblyStack::sourceIndices() const
 {
 	solAssert(m_evmAssembly);
-	std::map<std::string, unsigned> indices;
-	unsigned index = 0;
-	for (auto const& s: m_sourceList)
-		if (s != CompilerContext::yulUtilityFileName())
-			indices[s] = index++;
-	return indices;
+	return m_sourceList
+		| ranges::views::enumerate
+		| ranges::views::transform([](auto const& _source) { return std::make_pair(_source.second, _source.first); })
+		| ranges::to<std::map<std::string, unsigned>>;
 }
 
 std::string const* EVMAssemblyStack::sourceMapping(std::string const& _contractName) const

test/cmdlineTests/asm_json_import_all_valid_flags/output

@@ -33,7 +33,8 @@
                 },
                 "sourceList":
                 [
-                    "contract.sol"
+                    "contract.sol",
+                    "#utility.yul"
                 ]
             },
             "bin": "5ffe",
@@ -84,6 +85,7 @@ EVM assembly:
     },
     "sourceList":
     [
-        "contract.sol"
+        "contract.sol",
+        "#utility.yul"
     ]
 }