diff options
| -rw-r--r-- | llvm/include/llvm/ExecutionEngine/Orc/Core.h | 9 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/Core.cpp | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Core.h b/llvm/include/llvm/ExecutionEngine/Orc/Core.h index c88d71f4837..3ba210d55de 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Core.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Core.h @@ -529,8 +529,6 @@ public: using MaterializationUnitList = std::vector<std::unique_ptr<MaterializationUnit>>; - using VSOList = std::vector<VSO *>; - VSO(const VSO &) = delete; VSO &operator=(const VSO &) = delete; VSO(VSO &&) = delete; @@ -694,15 +692,16 @@ Expected<SymbolMap> blockingLookup(ExecutionSessionBase &ES, SymbolNameSet Names, bool WaiUntilReady, MaterializationResponsibility *MR = nullptr); +using VSOList = std::vector<VSO *>; + /// Look up the given names in the given VSOs. /// VSOs will be searched in order and no VSO pointer may be null. /// All symbols must be found within the given VSOs or an error /// will be returned. -Expected<SymbolMap> lookup(const VSO::VSOList &VSOs, SymbolNameSet Names); +Expected<SymbolMap> lookup(const VSOList &VSOs, SymbolNameSet Names); /// Look up a symbol by searching a list of VSOs. -Expected<JITEvaluatedSymbol> lookup(const VSO::VSOList &VSOs, - SymbolStringPtr Name); +Expected<JITEvaluatedSymbol> lookup(const VSOList &VSOs, SymbolStringPtr Name); /// Mangles symbol names then uniques them in the context of an /// ExecutionSession. diff --git a/llvm/lib/ExecutionEngine/Orc/Core.cpp b/llvm/lib/ExecutionEngine/Orc/Core.cpp index 333c3693e4a..5d28c882076 100644 --- a/llvm/lib/ExecutionEngine/Orc/Core.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Core.cpp @@ -1176,7 +1176,7 @@ Expected<SymbolMap> blockingLookup(ExecutionSessionBase &ES, #endif } -Expected<SymbolMap> lookup(const VSO::VSOList &VSOs, SymbolNameSet Names) { +Expected<SymbolMap> lookup(const VSOList &VSOs, SymbolNameSet Names) { if (VSOs.empty()) return SymbolMap(); @@ -1198,8 +1198,7 @@ Expected<SymbolMap> lookup(const VSO::VSOList &VSOs, SymbolNameSet Names) { } /// Look up a symbol by searching a list of VSOs. -Expected<JITEvaluatedSymbol> lookup(const VSO::VSOList &VSOs, - SymbolStringPtr Name) { +Expected<JITEvaluatedSymbol> lookup(const VSOList &VSOs, SymbolStringPtr Name) { SymbolNameSet Names({Name}); if (auto ResultMap = lookup(VSOs, std::move(Names))) { assert(ResultMap->size() == 1 && "Unexpected number of results"); |
