<div dir="ltr">Oops -- this commit doesn't do what the commit message claims. It removes the internal finalizer cruft, but keeps a StringMap<JITEvaluatedSymbol> rather than switching to a VSO. That's coming in a follow-up patch.<div><br></div><div>-- Lang.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Feb 21, 2018 at 1:55 PM, Lang Hames via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: lhames<br>
Date: Wed Feb 21 13:55:54 2018<br>
New Revision: 325726<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=325726&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=325726&view=rev</a><br>
Log:<br>
[ORC] Switch from a StringMap to an internal VSO in RTDyldObjectLinkingLayer.<br>
<br>
This is a first step towards switching to VSOs as the primary symbol tables in<br>
ORC.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/<wbr>ExecutionEngine/Orc/<wbr>RTDyldObjectLinkingLayer.h<br>
<br>
Modified: llvm/trunk/include/llvm/<wbr>ExecutionEngine/Orc/<wbr>RTDyldObjectLinkingLayer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h?rev=325726&r1=325725&r2=325726&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/ExecutionEngine/Orc/<wbr>RTDyldObjectLinkingLayer.h?<wbr>rev=325726&r1=325725&r2=<wbr>325726&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>ExecutionEngine/Orc/<wbr>RTDyldObjectLinkingLayer.h (original)<br>
+++ llvm/trunk/include/llvm/<wbr>ExecutionEngine/Orc/<wbr>RTDyldObjectLinkingLayer.h Wed Feb 21 13:55:54 2018<br>
@@ -103,16 +103,16 @@ public:<br>
private:<br>
using OwnedObject = object::OwningBinary<object::<wbr>ObjectFile>;<br>
<br>
- template <typename MemoryManagerPtrT, typename FinalizerFtor><br>
+ template <typename MemoryManagerPtrT><br>
class ConcreteLinkedObject : public LinkedObject {<br>
public:<br>
- ConcreteLinkedObject(<wbr>ExecutionSession &ES, OwnedObject Obj,<br>
- MemoryManagerPtrT MemMgr,<br>
+ ConcreteLinkedObject(<wbr>RTDyldObjectLinkingLayer &Parent, VModuleKey K,<br>
+ OwnedObject Obj, MemoryManagerPtrT MemMgr,<br>
std::shared_ptr<<wbr>SymbolResolver> Resolver,<br>
- FinalizerFtor Finalizer, bool ProcessAllSections)<br>
+ bool ProcessAllSections)<br>
: MemMgr(std::move(MemMgr)),<br>
PFC(llvm::make_unique<<wbr>PreFinalizeContents>(<br>
- ES, std::move(Obj), std::move(Resolver), std::move(Finalizer),<br>
+ Parent, std::move(K), std::move(Obj), std::move(Resolver),<br>
ProcessAllSections)) {<br>
buildInitialSymbolTable(PFC-><wbr>Obj);<br>
}<br>
@@ -124,18 +124,32 @@ private:<br>
Error finalize() override {<br>
assert(PFC && "mapSectionAddress called on finalized LinkedObject");<br>
<br>
- JITSymbolResolverAdapter ResolverAdapter(PFC->ES, *PFC->Resolver);<br>
- RuntimeDyld RTDyld(*MemMgr, ResolverAdapter);<br>
- RTDyld.setProcessAllSections(<wbr>PFC->ProcessAllSections);<br>
- PFC->RTDyld = &RTDyld;<br>
-<br>
- this->Finalized = true;<br>
- auto Err = PFC->Finalizer(RTDyld, std::move(PFC->Obj),<br>
- [&]() { this->updateSymbolTable(<wbr>RTDyld); });<br>
+ JITSymbolResolverAdapter ResolverAdapter(PFC->Parent.<wbr>ES, *PFC->Resolver);<br>
+ PFC->RTDyld = llvm::make_unique<RuntimeDyld><wbr>(*MemMgr, ResolverAdapter);<br>
+ PFC->RTDyld-><wbr>setProcessAllSections(PFC-><wbr>ProcessAllSections);<br>
+<br>
+ Finalized = true;<br>
+<br>
+ std::unique_ptr<RuntimeDyld::<wbr>LoadedObjectInfo> Info =<br>
+ PFC->RTDyld->loadObject(*PFC-><wbr>Obj.getBinary());<br>
+<br>
+ updateSymbolTable(*PFC-><wbr>RTDyld);<br>
+<br>
+ if (PFC->Parent.NotifyLoaded)<br>
+ PFC->Parent.NotifyLoaded(PFC-><wbr>K, *PFC->Obj.getBinary(), *Info);<br>
+<br>
+ PFC->RTDyld-><wbr>finalizeWithMemoryManagerLocki<wbr>ng();<br>
+<br>
+ if (PFC->RTDyld->hasError())<br>
+ return make_error<StringError>(PFC-><wbr>RTDyld->getErrorString(),<br>
+ inconvertibleErrorCode());<br>
+<br>
+ if (PFC->Parent.NotifyFinalized)<br>
+ PFC->Parent.NotifyFinalized(<wbr>PFC->K);<br>
<br>
// Release resources.<br>
PFC = nullptr;<br>
- return Err;<br>
+ return Error::success();<br>
}<br>
<br>
JITSymbol::GetAddressFtor getSymbolMaterializer(std::<wbr>string Name) override {<br>
@@ -181,34 +195,35 @@ private:<br>
// Contains the information needed prior to finalization: the object files,<br>
// memory manager, resolver, and flags needed for RuntimeDyld.<br>
struct PreFinalizeContents {<br>
- PreFinalizeContents(<wbr>ExecutionSession &ES, OwnedObject Obj,<br>
+ PreFinalizeContents(<wbr>RTDyldObjectLinkingLayer &Parent, VModuleKey K,<br>
+ OwnedObject Obj,<br>
std::shared_ptr<<wbr>SymbolResolver> Resolver,<br>
- FinalizerFtor Finalizer, bool ProcessAllSections)<br>
- : ES(ES), Obj(std::move(Obj)), Resolver(std::move(Resolver)),<br>
- Finalizer(std::move(Finalizer)<wbr>),<br>
+ bool ProcessAllSections)<br>
+ : Parent(Parent), K(std::move(K)), Obj(std::move(Obj)),<br>
+ Resolver(std::move(Resolver)),<br>
ProcessAllSections(<wbr>ProcessAllSections) {}<br>
<br>
- ExecutionSession &ES;<br>
+ RTDyldObjectLinkingLayer &Parent;<br>
+ VModuleKey K;<br>
OwnedObject Obj;<br>
std::shared_ptr<<wbr>SymbolResolver> Resolver;<br>
- FinalizerFtor Finalizer;<br>
bool ProcessAllSections;<br>
- RuntimeDyld *RTDyld;<br>
+ std::unique_ptr<RuntimeDyld> RTDyld;<br>
};<br>
<br>
MemoryManagerPtrT MemMgr;<br>
std::unique_ptr<<wbr>PreFinalizeContents> PFC;<br>
};<br>
<br>
- template <typename MemoryManagerPtrT, typename FinalizerFtor><br>
- std::unique_ptr<<wbr>ConcreteLinkedObject<<wbr>MemoryManagerPtrT, FinalizerFtor>><br>
- createLinkedObject(<wbr>ExecutionSession &ES, OwnedObject Obj,<br>
- MemoryManagerPtrT MemMgr,<br>
+ template <typename MemoryManagerPtrT><br>
+ std::unique_ptr<<wbr>ConcreteLinkedObject<<wbr>MemoryManagerPtrT>><br>
+ createLinkedObject(<wbr>RTDyldObjectLinkingLayer &Parent, VModuleKey K,<br>
+ OwnedObject Obj, MemoryManagerPtrT MemMgr,<br>
std::shared_ptr<<wbr>SymbolResolver> Resolver,<br>
- FinalizerFtor Finalizer, bool ProcessAllSections) {<br>
- using LOS = ConcreteLinkedObject<<wbr>MemoryManagerPtrT, FinalizerFtor>;<br>
- return llvm::make_unique<LOS>(ES, std::move(Obj), std::move(MemMgr),<br>
- std::move(Resolver), std::move(Finalizer),<br>
+ bool ProcessAllSections) {<br>
+ using LOS = ConcreteLinkedObject<<wbr>MemoryManagerPtrT>;<br>
+ return llvm::make_unique<LOS>(Parent, std::move(K), std::move(Obj),<br>
+ std::move(MemMgr), std::move(Resolver),<br>
ProcessAllSections);<br>
}<br>
<br>
@@ -249,36 +264,13 @@ public:<br>
if (!Obj)<br>
return Obj.takeError();<br>
<br>
- auto Finalizer = [&, K](RuntimeDyld &RTDyld, const OwnedObject &ObjToLoad,<br>
- std::function<void()> LOSHandleLoad) -> Error {<br>
- std::unique_ptr<RuntimeDyld::<wbr>LoadedObjectInfo> Info =<br>
- RTDyld.loadObject(*ObjToLoad.<wbr>getBinary());<br>
-<br>
- LOSHandleLoad();<br>
-<br>
- if (this->NotifyLoaded)<br>
- this->NotifyLoaded(K, *ObjToLoad.getBinary(), *Info);<br>
-<br>
- RTDyld.<wbr>finalizeWithMemoryManagerLocki<wbr>ng();<br>
-<br>
- if (RTDyld.hasError())<br>
- return make_error<StringError>(<wbr>RTDyld.getErrorString(),<br>
- inconvertibleErrorCode());<br>
-<br>
- if (this->NotifyFinalized)<br>
- this->NotifyFinalized(K);<br>
-<br>
- return Error::success();<br>
- };<br>
-<br>
assert(!LinkedObjects.count(K) && "VModuleKey already in use");<br>
<br>
auto R = GetResources(K);<br>
<br>
LinkedObjects[K] = createLinkedObject(<br>
- ES, OwnedObject(std::move(*Obj), std::move(ObjBuffer)),<br>
- std::move(R.MemMgr), std::move(R.Resolver), std::move(Finalizer),<br>
- ProcessAllSections);<br>
+ *this, K, OwnedObject(std::move(*Obj), std::move(ObjBuffer)),<br>
+ std::move(R.MemMgr), std::move(R.Resolver), ProcessAllSections);<br>
<br>
return Error::success();<br>
}<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>