diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Layer.h b/llvm/include/llvm/ExecutionEngine/Orc/Layer.h index ed839b518b72..0010fae99a74 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Layer.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Layer.h @@ -59,11 +59,23 @@ private: /// their linkage is changed to available-externally. class IRMaterializationUnit : public MaterializationUnit { public: + using SymbolNameToDefinitionMap = std::map; + + /// Create an IRMaterializationLayer. Scans the module to build the + /// SymbolFlags and SymbolToDefinition maps. IRMaterializationUnit(ExecutionSession &ES, std::unique_ptr M); + /// Create an IRMaterializationLayer from a module, and pre-existing + /// SymbolFlags and SymbolToDefinition maps. The maps must provide + /// entries for each definition in M. + /// This constructor is useful for delegating work from one + /// IRMaterializationUnit to another. + IRMaterializationUnit(std::unique_ptr M, SymbolFlagsMap SymbolFlags, + SymbolNameToDefinitionMap SymbolToDefinition); + protected: std::unique_ptr M; - std::map SymbolToDefinition; + SymbolNameToDefinitionMap SymbolToDefinition; private: void discard(const VSO &V, SymbolStringPtr Name) override; diff --git a/llvm/lib/ExecutionEngine/Orc/Layer.cpp b/llvm/lib/ExecutionEngine/Orc/Layer.cpp index 1927bce45d47..cbf1f4c244d2 100644 --- a/llvm/lib/ExecutionEngine/Orc/Layer.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Layer.cpp @@ -51,6 +51,12 @@ IRMaterializationUnit::IRMaterializationUnit(ExecutionSession &ES, } } +IRMaterializationUnit::IRMaterializationUnit( + std::unique_ptr M, SymbolFlagsMap SymbolFlags, + SymbolNameToDefinitionMap SymbolToDefinition) + : MaterializationUnit(std::move(SymbolFlags)), M(std::move(M)), + SymbolToDefinition(std::move(SymbolToDefinition)) {} + void IRMaterializationUnit::discard(const VSO &V, SymbolStringPtr Name) { auto I = SymbolToDefinition.find(Name); assert(I != SymbolToDefinition.end() &&