commit d5f56c5979d697f1c9eabf0bdfd882baac55f402
author Lang Hames <lhames@gmail.com> Fri Aug 17 21:18:18 2018 +0000
committer Lang Hames <lhames@gmail.com> Fri Aug 17 21:18:18 2018 +0000
tree 429704c49ac5d2242df1cf08cae2ce572975add7
parent 469f076356e864b438a96a17b4c265014277e982

[ORC] Rename VSO to JITDylib.

VSO was a little close to VDSO (an acronym on Linux for Virtual Dynamic Shared
Object) for comfort. It also risks giving the impression that instances of this
class could be shared between ExecutionSessions, which they can not.

JITDylib seems moderately less confusing, while still hinting at how this
class is intended to be used, i.e. as a JIT-compiled stand-in for a dynamic
library (code that would have been a dynamic library if you had wanted to
compile it ahead of time).

llvm-svn: 340084

llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp

diff --git a/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp b/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
index 71b4b73..3ceafc2 100644
--- a/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
@@ -14,12 +14,12 @@
 using namespace llvm;
 using namespace llvm::orc;
 
-class VSOSearchOrderResolver : public JITSymbolResolver {
+class JITDylibSearchOrderResolver : public JITSymbolResolver {
 public:
-  VSOSearchOrderResolver(MaterializationResponsibility &MR) : MR(MR) {}
+  JITDylibSearchOrderResolver(MaterializationResponsibility &MR) : MR(MR) {}
 
   Expected<LookupResult> lookup(const LookupSet &Symbols) {
-    auto &ES = MR.getTargetVSO().getExecutionSession();
+    auto &ES = MR.getTargetJITDylib().getExecutionSession();
     SymbolNameSet InternedSymbols;
 
     for (auto &S : Symbols)
@@ -30,8 +30,8 @@
     };
 
     auto InternedResult =
-        MR.getTargetVSO().withSearchOrderDo([&](const VSOList &VSOs) {
-          return ES.lookup(VSOs, InternedSymbols, RegisterDependencies, false);
+        MR.getTargetJITDylib().withSearchOrderDo([&](const JITDylibList &JDs) {
+          return ES.lookup(JDs, InternedSymbols, RegisterDependencies, false);
         });
 
     if (!InternedResult)
@@ -45,7 +45,7 @@
   }
 
   Expected<LookupFlagsResult> lookupFlags(const LookupSet &Symbols) {
-    auto &ES = MR.getTargetVSO().getExecutionSession();
+    auto &ES = MR.getTargetJITDylib().getExecutionSession();
 
     SymbolNameSet InternedSymbols;
 
@@ -53,13 +53,13 @@
       InternedSymbols.insert(ES.getSymbolStringPool().intern(S));
 
     SymbolFlagsMap InternedResult;
-    MR.getTargetVSO().withSearchOrderDo([&](const VSOList &VSOs) {
+    MR.getTargetJITDylib().withSearchOrderDo([&](const JITDylibList &JDs) {
       // An empty search order is pathalogical, but allowed.
-      if (VSOs.empty())
+      if (JDs.empty())
         return;
 
-      assert(VSOs.front() && "VSOList entry can not be null");
-      InternedResult = VSOs.front()->lookupFlags(InternedSymbols);
+      assert(JDs.front() && "VSOList entry can not be null");
+      InternedResult = JDs.front()->lookupFlags(InternedSymbols);
     });
 
     LookupFlagsResult Result;
@@ -100,7 +100,7 @@
 
   auto MemoryManager = GetMemoryManager(K);
 
-  VSOSearchOrderResolver Resolver(R);
+  JITDylibSearchOrderResolver Resolver(R);
   auto RTDyld = llvm::make_unique<RuntimeDyld>(*MemoryManager, Resolver);
   RTDyld->setProcessAllSections(ProcessAllSections);