[yul] Functions: Remove dependency on AST ID.

ethereum · Jun 22, 2021 · 3e09ab6 · 3e09ab6
1 parent 9cf6021
commit 3e09ab6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
@@ -177,3 +177,8 @@ ABIFunctions IRGenerationContext::abiFunctions()
 {
 	return ABIFunctions(m_evmVersion, m_revertStrings, m_functions);
 }
+
+uint64_t IRGenerationContext::internalFunctionID(FunctionDefinition const& _function)
+{
+	return m_functionIDs.try_emplace(_function.id(), m_functionIDs.size() + 1).second;
+}
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -152,6 +152,10 @@ class IRGenerationContext
 	bool inlineAssemblySeen() const { return m_inlineAssemblySeen; }
 	void setInlineAssemblySeen() { m_inlineAssemblySeen = true; }
 
+	/// @returns the runtime ID to be used for the function in the dispatch routine
+	/// and for internal function pointers.
+	uint64_t internalFunctionID(FunctionDefinition const& _function);
+
 	std::map<std::string, unsigned> const& sourceIndices() const { return m_sourceIndices; }
 
 private:
@@ -191,6 +195,8 @@ class IRGenerationContext
 	/// the code contains a call via a pointer even though a specific function is never assigned to it.
 	/// It will fail at runtime but the code must still compile.
 	InternalDispatchMap m_internalDispatchMap;
+	/// Map used by @a internalFunctionID.
+	std::map<int64_t, uint64_t> m_functionIDs;
 
 	std::set<ContractDefinition const*, ASTNode::CompareByID> m_subObjects;
 };

diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -299,7 +299,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 				solAssert(m_context.functionCollector().contains(IRNames::function(*function)), "");
 
 				cases.emplace_back(map<string, string>{
-					{"funID", to_string(function->id())},
+					{"funID", to_string(m_context.internalFunctionID(*function))},
 					{"name", IRNames::function(*function)}
 				});
 			}

diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1577,7 +1577,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		if (memberFunctionType->kind() == FunctionType::Kind::Internal)
 		{
 			auto const& functionDefinition = dynamic_cast<FunctionDefinition const&>(memberFunctionType->declaration());
-			define(IRVariable(_memberAccess).part("functionIdentifier")) << to_string(functionDefinition.id()) << "\n";
+			define(IRVariable(_memberAccess).part("functionIdentifier")) << to_string(m_context.internalFunctionID(functionDefinition.id())) << "\n";
 			if (!_memberAccess.annotation().calledDirectly)
 				m_context.addToInternalDispatch(functionDefinition);
 		}
@@ -1918,7 +1918,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 						*_memberAccess.annotation().referencedDeclaration
 					).resolveVirtual(m_context.mostDerivedContract(), super);
 
-				define(_memberAccess) << to_string(resolvedFunctionDef.id()) << "\n";
+				define(_memberAccess) << to_string(m_context.internalFunctionID(resolvedFunctionDef.id())) << "\n";
 				solAssert(resolvedFunctionDef.functionType(true), "");
 				solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal, "");
 				if (!_memberAccess.annotation().calledDirectly)
@@ -1935,7 +1935,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				case FunctionType::Kind::Internal:
 					if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
 					{
-						define(_memberAccess) << to_string(function->id()) << "\n";
+						define(_memberAccess) << to_string(m_context.internalFunctionID(function->id())) << "\n";
 						if (!_memberAccess.annotation().calledDirectly)
 							m_context.addToInternalDispatch(*function);
 					}
@@ -2021,7 +2021,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 			solAssert(funType->kind() == FunctionType::Kind::Internal, "");
 			solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
 
-			define(_memberAccess) << to_string(function->id()) << "\n";
+			define(_memberAccess) << to_string(m_context.internalFunctionID(function->id())) << "\n";
 
 			if (!_memberAccess.annotation().calledDirectly)
 				m_context.addToInternalDispatch(*function);
@@ -2268,7 +2268,7 @@ void IRGeneratorForStatements::endVisit(Identifier const& _identifier)
 	{
 		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, "");
 		FunctionDefinition const& resolvedFunctionDef = functionDef->resolveVirtual(m_context.mostDerivedContract());
-		define(_identifier) << to_string(resolvedFunctionDef.id()) << "\n";
+		define(_identifier) << to_string(m_context.internalFunctionID(resolvedFunctionDef.id())) << "\n";
 
 		solAssert(resolvedFunctionDef.functionType(true), "");
 		solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal, "");