<div dir="ltr">I'm getting this warning when compiled with gcc 5.5<div><br></div><div>include/llvm/ExecutionEngine/Orc/Core.h:690:25: error: ‘llvm::orc::JITDylib::SymbolTableEntry::State’ is too small to hold all values of ‘enum class llvm::orc::JITDylib::SymbolState’ [-Werror]<br> SymbolState State : 6;<br></div><div><br></div><div>I think gcc uses the declared type of the enum class for this check. So it wants 8 bits here to match the uint8_t.</div><div><br clear="all"><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature">~Craig</div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, May 28, 2019 at 4:32 PM Lang Hames via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: lhames<br>
Date: Tue May 28 16:35:44 2019<br>
New Revision: 361899<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=361899&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=361899&view=rev</a><br>
Log:<br>
[ORC] Track JIT symbol states more explicitly.<br>
<br>
Prior to this patch, JITDylibs inferred symbol states (whether a symbol was<br>
newly added, materializing, resolved, or ready to run) via a combination of (1)<br>
bits in the JITSymbolFlags member, and (2) the state of some internal JITDylib<br>
data structures. This patch explicitly tracks symbol states by adding a new<br>
SymbolState member to the symbol table entries, and removing the 'Lazy' and<br>
'Materializing' bits from JITSymbolFlags. This is a first step towards adding<br>
additional states representing initialization phases (e.g. eh-frame registration,<br>
registration with the language runtime, and static initialization).<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/ExecutionEngine/JITSymbol.h<br>
llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h<br>
llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp<br>
llvm/trunk/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ExecutionEngine/JITSymbol.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/JITSymbol.h?rev=361899&r1=361898&r2=361899&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/JITSymbol.h?rev=361899&r1=361898&r2=361899&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ExecutionEngine/JITSymbol.h (original)<br>
+++ llvm/trunk/include/llvm/ExecutionEngine/JITSymbol.h Tue May 28 16:35:44 2019<br>
@@ -65,15 +65,9 @@ public:<br>
Absolute = 1U << 3,<br>
Exported = 1U << 4,<br>
Callable = 1U << 5,<br>
- Lazy = 1U << 6,<br>
- Materializing = 1U << 7,<br>
- LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ Materializing)<br>
+ LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ Callable)<br>
};<br>
<br>
- static JITSymbolFlags stripTransientFlags(JITSymbolFlags Orig) {<br>
- return static_cast<FlagNames>(Orig.Flags & ~Lazy & ~Materializing);<br>
- }<br>
-<br>
/// Default-construct a JITSymbolFlags instance.<br>
JITSymbolFlags() = default;<br>
<br>
@@ -110,19 +104,6 @@ public:<br>
return (Flags & HasError) == HasError;<br>
}<br>
<br>
- /// Returns true if this is a lazy symbol.<br>
- /// This flag is used internally by the JIT APIs to track<br>
- /// materialization states.<br>
- bool isLazy() const { return Flags & Lazy; }<br>
-<br>
- /// Returns true if this symbol is in the process of being<br>
- /// materialized.<br>
- bool isMaterializing() const { return Flags & Materializing; }<br>
-<br>
- /// Returns true if this symbol is fully materialized.<br>
- /// (i.e. neither lazy, nor materializing).<br>
- bool isMaterialized() const { return !(Flags & (Lazy | Materializing)); }<br>
-<br>
/// Returns true if the Weak flag is set.<br>
bool isWeak() const {<br>
return (Flags & Weak) == Weak;<br>
<br>
Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h?rev=361899&r1=361898&r2=361899&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h?rev=361899&r1=361898&r2=361899&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h (original)<br>
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h Tue May 28 16:35:44 2019<br>
@@ -641,6 +641,59 @@ private:<br>
LLVM_MARK_AS_BITMASK_ENUM(NotifyFullyReady)<br>
};<br>
<br>
+ enum class SymbolState : uint8_t {<br>
+ Invalid, // No symbol should be in this state.<br>
+ NeverSearched, // Added to the symbol table, never queried.<br>
+ Materializing, // Queried, materialization begun.<br>
+ Resolved, // Assigned address, still materializing.<br>
+ Ready = 0x3f // Ready and safe for clients to access.<br>
+ };<br>
+<br>
+ class SymbolTableEntry {<br>
+ public:<br>
+ SymbolTableEntry() = default;<br>
+ SymbolTableEntry(JITSymbolFlags Flags)<br>
+ : Flags(Flags), State(SymbolState::NeverSearched),<br>
+ MaterializerAttached(false), PendingRemoval(false) {}<br>
+<br>
+ JITTargetAddress getAddress() const { return Addr; }<br>
+ JITSymbolFlags getFlags() const { return Flags; }<br>
+ SymbolState getState() const { return State; }<br>
+<br>
+ bool isInMaterializationPhase() const {<br>
+ return State == SymbolState::Materializing ||<br>
+ State == SymbolState::Resolved;<br>
+ }<br>
+<br>
+ bool hasMaterializerAttached() const { return MaterializerAttached; }<br>
+ bool isPendingRemoval() const { return PendingRemoval; }<br>
+<br>
+ void setAddress(JITTargetAddress Addr) { this->Addr = Addr; }<br>
+ void setFlags(JITSymbolFlags Flags) { this->Flags = Flags; }<br>
+ void setState(SymbolState State) { this->State = State; }<br>
+<br>
+ void setMaterializerAttached(bool MaterializerAttached) {<br>
+ this->MaterializerAttached = MaterializerAttached;<br>
+ }<br>
+<br>
+ void setPendingRemoval(bool PendingRemoval) {<br>
+ this->PendingRemoval = PendingRemoval;<br>
+ }<br>
+<br>
+ JITEvaluatedSymbol getSymbol() const {<br>
+ return JITEvaluatedSymbol(Addr, Flags);<br>
+ }<br>
+<br>
+ private:<br>
+ JITTargetAddress Addr = 0;<br>
+ JITSymbolFlags Flags;<br>
+ SymbolState State : 6;<br>
+ bool MaterializerAttached : 1;<br>
+ bool PendingRemoval : 1;<br>
+ };<br>
+<br>
+ using SymbolTable = DenseMap<SymbolStringPtr, SymbolTableEntry>;<br>
+<br>
JITDylib(ExecutionSession &ES, std::string Name);<br>
<br>
Error defineImpl(MaterializationUnit &MU);<br>
@@ -685,7 +738,7 @@ private:<br>
<br>
ExecutionSession &ES;<br>
std::string JITDylibName;<br>
- SymbolMap Symbols;<br>
+ SymbolTable Symbols;<br>
UnmaterializedInfosMap UnmaterializedInfos;<br>
MaterializingInfosMap MaterializingInfos;<br>
GeneratorFunction DefGenerator;<br>
<br>
Modified: llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp?rev=361899&r1=361898&r2=361899&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp?rev=361899&r1=361898&r2=361899&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp (original)<br>
+++ llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp Tue May 28 16:35:44 2019<br>
@@ -371,11 +371,6 @@ MaterializationResponsibility::Materiali<br>
JITDylib &JD, SymbolFlagsMap SymbolFlags, VModuleKey K)<br>
: JD(JD), SymbolFlags(std::move(SymbolFlags)), K(std::move(K)) {<br>
assert(!this->SymbolFlags.empty() && "Materializing nothing?");<br>
-<br>
-#ifndef NDEBUG<br>
- for (auto &KV : this->SymbolFlags)<br>
- KV.second |= JITSymbolFlags::Materializing;<br>
-#endif<br>
}<br>
<br>
MaterializationResponsibility::~MaterializationResponsibility() {<br>
@@ -395,8 +390,6 @@ void MaterializationResponsibility::reso<br>
auto I = SymbolFlags.find(KV.first);<br>
assert(I != SymbolFlags.end() &&<br>
"Resolving symbol outside this responsibility set");<br>
- assert(I->second.isMaterializing() && "Duplicate resolution");<br>
- I->second &= ~JITSymbolFlags::Materializing;<br>
if (I->second.isWeak())<br>
assert(I->second == (KV.second.getFlags() | JITSymbolFlags::Weak) &&<br>
"Resolving symbol with incorrect flags");<br>
@@ -415,12 +408,6 @@ void MaterializationResponsibility::emit<br>
dbgs() << "In " << JD.getName() << " emitting " << SymbolFlags << "\n";<br>
});<br>
<br>
-#ifndef NDEBUG<br>
- for (auto &KV : SymbolFlags)<br>
- assert(!KV.second.isMaterializing() &&<br>
- "Failed to resolve symbol before emission");<br>
-#endif // NDEBUG<br>
-<br>
JD.emit(SymbolFlags);<br>
SymbolFlags.clear();<br>
}<br>
@@ -431,13 +418,8 @@ Error MaterializationResponsibility::def<br>
// It's ok if we hit a duplicate here: In that case the new version will be<br>
// discarded, and the JITDylib::defineMaterializing method will return a<br>
// duplicate symbol error.<br>
- for (auto &KV : NewSymbolFlags) {<br>
- auto I = SymbolFlags.insert(KV).first;<br>
- (void)I;<br>
-#ifndef NDEBUG<br>
- I->second |= JITSymbolFlags::Materializing;<br>
-#endif<br>
- }<br>
+ for (auto &KV : NewSymbolFlags)<br>
+ SymbolFlags.insert(KV);<br>
<br>
return JD.defineMaterializing(NewSymbolFlags);<br>
}<br>
@@ -744,21 +726,19 @@ ReexportsGenerator::operator()(JITDylib<br>
<br>
Error JITDylib::defineMaterializing(const SymbolFlagsMap &SymbolFlags) {<br>
return ES.runSessionLocked([&]() -> Error {<br>
- std::vector<SymbolMap::iterator> AddedSyms;<br>
+ std::vector<SymbolTable::iterator> AddedSyms;<br>
<br>
for (auto &KV : SymbolFlags) {<br>
- SymbolMap::iterator EntryItr;<br>
+ SymbolTable::iterator EntryItr;<br>
bool Added;<br>
<br>
- auto NewFlags = KV.second;<br>
- NewFlags |= JITSymbolFlags::Materializing;<br>
-<br>
- std::tie(EntryItr, Added) = Symbols.insert(<br>
- std::make_pair(KV.first, JITEvaluatedSymbol(0, NewFlags)));<br>
+ std::tie(EntryItr, Added) =<br>
+ Symbols.insert(std::make_pair(KV.first, SymbolTableEntry(KV.second)));<br>
<br>
- if (Added)<br>
+ if (Added) {<br>
AddedSyms.push_back(EntryItr);<br>
- else {<br>
+ EntryItr->second.setState(SymbolState::Materializing);<br>
+ } else {<br>
// Remove any symbols already added.<br>
for (auto &SI : AddedSyms)<br>
Symbols.erase(SI);<br>
@@ -782,9 +762,10 @@ void JITDylib::replace(std::unique_ptr<M<br>
for (auto &KV : MU->getSymbols()) {<br>
auto SymI = Symbols.find(KV.first);<br>
assert(SymI != Symbols.end() && "Replacing unknown symbol");<br>
- assert(!SymI->second.getFlags().isLazy() &&<br>
- SymI->second.getFlags().isMaterializing() &&<br>
- "Can not replace symbol that is not materializing");<br>
+ assert(SymI->second.isInMaterializationPhase() &&<br>
+ "Can not call replace on a symbol that is not materializing");<br>
+ assert(!SymI->second.hasMaterializerAttached() &&<br>
+ "Symbol should not have materializer attached already");<br>
assert(UnmaterializedInfos.count(KV.first) == 0 &&<br>
"Symbol being replaced should have no UnmaterializedInfo");<br>
}<br>
@@ -803,16 +784,15 @@ void JITDylib::replace(std::unique_ptr<M<br>
// Otherwise, make MU responsible for all the symbols.<br>
auto UMI = std::make_shared<UnmaterializedInfo>(std::move(MU));<br>
for (auto &KV : UMI->MU->getSymbols()) {<br>
- assert(!KV.second.isLazy() &&<br>
- "Lazy flag should be managed internally.");<br>
- assert(!KV.second.isMaterializing() &&<br>
- "Materializing flags should be managed internally.");<br>
-<br>
auto SymI = Symbols.find(KV.first);<br>
- JITSymbolFlags ReplaceFlags = KV.second;<br>
- ReplaceFlags |= JITSymbolFlags::Lazy;<br>
- SymI->second = JITEvaluatedSymbol(SymI->second.getAddress(),<br>
- std::move(ReplaceFlags));<br>
+ assert(SymI->second.getState() == SymbolState::Materializing &&<br>
+ "Can not replace a symbol that is not materializing");<br>
+ assert(!SymI->second.hasMaterializerAttached() &&<br>
+ "Can not replace a symbol that has a materializer attached");<br>
+ assert(UnmaterializedInfos.count(KV.first) == 0 &&<br>
+ "Unexpected materializer entry in map");<br>
+ SymI->second.setAddress(SymI->second.getAddress());<br>
+ SymI->second.setMaterializerAttached(true);<br>
UnmaterializedInfos[KV.first] = UMI;<br>
}<br>
<br>
@@ -830,9 +810,9 @@ JITDylib::getRequestedSymbols(const Symb<br>
<br>
for (auto &KV : SymbolFlags) {<br>
assert(Symbols.count(KV.first) && "JITDylib does not cover this symbol?");<br>
- assert(Symbols.find(KV.first)->second.getFlags().isMaterializing() &&<br>
- "getRequestedSymbols can only be called for materializing "<br>
- "symbols");<br>
+ assert(Symbols.find(KV.first)->second.isInMaterializationPhase() &&<br>
+ "getRequestedSymbols can only be called for symbols that have "<br>
+ "started materializing");<br>
auto I = MaterializingInfos.find(KV.first);<br>
if (I == MaterializingInfos.end())<br>
continue;<br>
@@ -848,9 +828,8 @@ JITDylib::getRequestedSymbols(const Symb<br>
void JITDylib::addDependencies(const SymbolStringPtr &Name,<br>
const SymbolDependenceMap &Dependencies) {<br>
assert(Symbols.count(Name) && "Name not in symbol table");<br>
- assert((Symbols[Name].getFlags().isLazy() ||<br>
- Symbols[Name].getFlags().isMaterializing()) &&<br>
- "Symbol is not lazy or materializing");<br>
+ assert(Symbols[Name].isInMaterializationPhase() &&<br>
+ "Can not add dependencies for a symbol that is not materializing");<br>
<br>
auto &MI = MaterializingInfos[Name];<br>
assert(!MI.IsEmitted && "Can not add dependencies to an emitted symbol");<br>
@@ -865,9 +844,8 @@ void JITDylib::addDependencies(const Sym<br>
// Assert that this symbol exists and has not been emitted already.<br>
auto SymI = OtherJITDylib.Symbols.find(OtherSymbol);<br>
assert(SymI != OtherJITDylib.Symbols.end() &&<br>
- (SymI->second.getFlags().isLazy() ||<br>
- SymI->second.getFlags().isMaterializing()) &&<br>
- "Dependency on emitted symbol");<br>
+ (SymI->second.getState() != SymbolState::Ready &&<br>
+ "Dependency on emitted symbol"));<br>
#endif<br>
<br>
auto &OtherMI = OtherJITDylib.MaterializingInfos[OtherSymbol];<br>
@@ -892,27 +870,25 @@ void JITDylib::resolve(const SymbolMap &<br>
auto &Name = KV.first;<br>
auto Sym = KV.second;<br>
<br>
- assert(!Sym.getFlags().isLazy() && !Sym.getFlags().isMaterializing() &&<br>
- "Materializing flags should be managed internally");<br>
-<br>
auto I = Symbols.find(Name);<br>
<br>
assert(I != Symbols.end() && "Symbol not found");<br>
- assert(!I->second.getFlags().isLazy() &&<br>
- I->second.getFlags().isMaterializing() &&<br>
+ assert(!I->second.hasMaterializerAttached() &&<br>
+ "Resolving symbol with materializer attached?");<br>
+ assert(I->second.getState() == SymbolState::Materializing &&<br>
"Symbol should be materializing");<br>
assert(I->second.getAddress() == 0 && "Symbol has already been resolved");<br>
<br>
assert((Sym.getFlags() & ~JITSymbolFlags::Weak) ==<br>
- (JITSymbolFlags::stripTransientFlags(I->second.getFlags()) &<br>
- ~JITSymbolFlags::Weak) &&<br>
+ (I->second.getFlags() & ~JITSymbolFlags::Weak) &&<br>
"Resolved flags should match the declared flags");<br>
<br>
// Once resolved, symbols can never be weak.<br>
JITSymbolFlags ResolvedFlags = Sym.getFlags();<br>
ResolvedFlags &= ~JITSymbolFlags::Weak;<br>
- ResolvedFlags |= JITSymbolFlags::Materializing;<br>
- I->second = JITEvaluatedSymbol(Sym.getAddress(), ResolvedFlags);<br>
+ I->second.setAddress(Sym.getAddress());<br>
+ I->second.setFlags(ResolvedFlags);<br>
+ I->second.setState(SymbolState::Resolved);<br>
<br>
auto &MI = MaterializingInfos[Name];<br>
for (auto &Q : MI.PendingQueries) {<br>
@@ -986,9 +962,7 @@ void JITDylib::emit(const SymbolFlagsMap<br>
// and update its materializing state.<br>
assert(DependantJD.Symbols.count(DependantName) &&<br>
"Dependant has no entry in the Symbols table");<br>
- auto &DependantSym = DependantJD.Symbols[DependantName];<br>
- DependantSym.setFlags(DependantSym.getFlags() &<br>
- ~JITSymbolFlags::Materializing);<br>
+ DependantJD.Symbols[DependantName].setState(SymbolState::Ready);<br>
DependantJD.MaterializingInfos.erase(DependantMII);<br>
}<br>
}<br>
@@ -1005,8 +979,7 @@ void JITDylib::emit(const SymbolFlagsMap<br>
}<br>
assert(Symbols.count(Name) &&<br>
"Symbol has no entry in the Symbols table");<br>
- auto &Sym = Symbols[Name];<br>
- Sym.setFlags(Sym.getFlags() & ~JITSymbolFlags::Materializing);<br>
+ Symbols[Name].setState(SymbolState::Ready);<br>
MaterializingInfos.erase(MII);<br>
}<br>
}<br>
@@ -1124,7 +1097,7 @@ void JITDylib::removeFromSearchOrder(JIT<br>
Error JITDylib::remove(const SymbolNameSet &Names) {<br>
return ES.runSessionLocked([&]() -> Error {<br>
using SymbolMaterializerItrPair =<br>
- std::pair<SymbolMap::iterator, UnmaterializedInfosMap::iterator>;<br>
+ std::pair<SymbolTable::iterator, UnmaterializedInfosMap::iterator>;<br>
std::vector<SymbolMaterializerItrPair> SymbolsToRemove;<br>
SymbolNameSet Missing;<br>
SymbolNameSet Materializing;<br>
@@ -1139,13 +1112,14 @@ Error JITDylib::remove(const SymbolNameS<br>
}<br>
<br>
// Note symbol materializing.<br>
- if (I->second.getFlags().isMaterializing()) {<br>
+ if (I->second.isInMaterializationPhase()) {<br>
Materializing.insert(Name);<br>
continue;<br>
}<br>
<br>
- auto UMII = I->second.getFlags().isLazy() ? UnmaterializedInfos.find(Name)<br>
- : UnmaterializedInfos.end();<br>
+ auto UMII = I->second.hasMaterializerAttached()<br>
+ ? UnmaterializedInfos.find(Name)<br>
+ : UnmaterializedInfos.end();<br>
SymbolsToRemove.push_back(std::make_pair(I, UMII));<br>
}<br>
<br>
@@ -1205,14 +1179,11 @@ Expected<SymbolNameSet> JITDylib::lookup<br>
<br>
for (auto &Name : Names) {<br>
auto I = Symbols.find(Name);<br>
-<br>
- if (I == Symbols.end()) {<br>
+ if (I != Symbols.end()) {<br>
+ assert(!Flags.count(Name) && "Symbol already present in Flags map");<br>
+ Flags[Name] = I->second.getFlags();<br>
+ } else<br>
Unresolved.insert(Name);<br>
- continue;<br>
- }<br>
-<br>
- assert(!Flags.count(Name) && "Symbol already present in Flags map");<br>
- Flags[Name] = JITSymbolFlags::stripTransientFlags(I->second.getFlags());<br>
}<br>
<br>
return Unresolved;<br>
@@ -1247,6 +1218,7 @@ void JITDylib::lodgeQueryImpl(<br>
<br>
std::vector<SymbolStringPtr> ToRemove;<br>
for (auto Name : Unresolved) {<br>
+<br>
// Search for the name in Symbols. Skip it if not found.<br>
auto SymI = Symbols.find(Name);<br>
if (SymI == Symbols.end())<br>
@@ -1260,16 +1232,17 @@ void JITDylib::lodgeQueryImpl(<br>
// set.<br>
ToRemove.push_back(Name);<br>
<br>
- // If the symbol has an address then resolve it.<br>
- if (SymI->second.getAddress() != 0)<br>
- Q->resolve(Name, SymI->second);<br>
-<br>
- // If the symbol is lazy, get the MaterialiaztionUnit for it.<br>
- if (SymI->second.getFlags().isLazy()) {<br>
+ if (SymI->second.getState() >= SymbolState::Resolved) {<br>
+ assert(!SymI->second.hasMaterializerAttached() &&<br>
+ "Resolved symbols should not have materializers attached");<br>
+ Q->resolve(Name, SymI->second.getSymbol());<br>
+ if (SymI->second.getState() == SymbolState::Ready) {<br>
+ Q->notifySymbolReady();<br>
+ continue;<br>
+ }<br>
+ } else if (SymI->second.hasMaterializerAttached()) {<br>
assert(SymI->second.getAddress() == 0 &&<br>
- "Lazy symbol should not have a resolved address");<br>
- assert(!SymI->second.getFlags().isMaterializing() &&<br>
- "Materializing and lazy should not both be set");<br>
+ "Symbol not resolved but already has address?");<br>
auto UMII = UnmaterializedInfos.find(Name);<br>
assert(UMII != UnmaterializedInfos.end() &&<br>
"Lazy symbol should have UnmaterializedInfo");<br>
@@ -1280,24 +1253,17 @@ void JITDylib::lodgeQueryImpl(<br>
// materializing state.<br>
for (auto &KV : MU->getSymbols()) {<br>
auto SymK = Symbols.find(KV.first);<br>
- auto Flags = SymK->second.getFlags();<br>
- Flags &= ~JITSymbolFlags::Lazy;<br>
- Flags |= JITSymbolFlags::Materializing;<br>
- SymK->second.setFlags(Flags);<br>
+ SymK->second.setMaterializerAttached(false);<br>
+ SymK->second.setState(SymbolState::Materializing);<br>
UnmaterializedInfos.erase(KV.first);<br>
}<br>
<br>
// Add MU to the list of MaterializationUnits to be materialized.<br>
MUs.push_back(std::move(MU));<br>
- } else if (!SymI->second.getFlags().isMaterializing()) {<br>
- // The symbol is neither lazy nor materializing, so it must be<br>
- // ready. Notify the query and continue.<br>
- Q->notifySymbolReady();<br>
- continue;<br>
}<br>
<br>
// Add the query to the PendingQueries list.<br>
- assert(SymI->second.getFlags().isMaterializing() &&<br>
+ assert(SymI->second.isInMaterializationPhase() &&<br>
"By this line the symbol should be materializing");<br>
auto &MI = MaterializingInfos[Name];<br>
MI.PendingQueries.push_back(Q);<br>
@@ -1387,17 +1353,15 @@ JITDylib::lookupImpl(std::shared_ptr<Asy<br>
<br>
// If the symbol has an address then resolve it.<br>
if (SymI->second.getAddress() != 0) {<br>
- Q->resolve(Name, SymI->second);<br>
+ Q->resolve(Name, SymI->second.getSymbol());<br>
if (Q->isFullyResolved())<br>
ActionFlags |= NotifyFullyResolved;<br>
}<br>
<br>
// If the symbol is lazy, get the MaterialiaztionUnit for it.<br>
- if (SymI->second.getFlags().isLazy()) {<br>
+ if (SymI->second.hasMaterializerAttached()) {<br>
assert(SymI->second.getAddress() == 0 &&<br>
"Lazy symbol should not have a resolved address");<br>
- assert(!SymI->second.getFlags().isMaterializing() &&<br>
- "Materializing and lazy should not both be set");<br>
auto UMII = UnmaterializedInfos.find(Name);<br>
assert(UMII != UnmaterializedInfos.end() &&<br>
"Lazy symbol should have UnmaterializedInfo");<br>
@@ -1408,18 +1372,15 @@ JITDylib::lookupImpl(std::shared_ptr<Asy<br>
// materializing state.<br>
for (auto &KV : MU->getSymbols()) {<br>
auto SymK = Symbols.find(KV.first);<br>
- auto Flags = SymK->second.getFlags();<br>
- Flags &= ~JITSymbolFlags::Lazy;<br>
- Flags |= JITSymbolFlags::Materializing;<br>
- SymK->second.setFlags(Flags);<br>
+ assert(SymK != Symbols.end() && "Missing symbol table entry");<br>
+ SymK->second.setState(SymbolState::Materializing);<br>
+ SymK->second.setMaterializerAttached(false);<br>
UnmaterializedInfos.erase(KV.first);<br>
}<br>
<br>
// Add MU to the list of MaterializationUnits to be materialized.<br>
MUs.push_back(std::move(MU));<br>
- } else if (!SymI->second.getFlags().isMaterializing()) {<br>
- // The symbol is neither lazy nor materializing, so it must be ready.<br>
- // Notify the query and continue.<br>
+ } else if (SymI->second.getState() == SymbolState::Ready) {<br>
Q->notifySymbolReady();<br>
if (Q->isFullyReady())<br>
ActionFlags |= NotifyFullyReady;<br>
@@ -1427,7 +1388,7 @@ JITDylib::lookupImpl(std::shared_ptr<Asy<br>
}<br>
<br>
// Add the query to the PendingQueries list.<br>
- assert(SymI->second.getFlags().isMaterializing() &&<br>
+ assert(SymI->second.isInMaterializationPhase() &&<br>
"By this line the symbol should be materializing");<br>
auto &MI = MaterializingInfos[Name];<br>
MI.PendingQueries.push_back(Q);<br>
@@ -1455,21 +1416,36 @@ void JITDylib::dump(raw_ostream &OS) {<br>
for (auto &KV : Symbols) {<br>
OS << " \"" << *KV.first << "\": ";<br>
if (auto Addr = KV.second.getAddress())<br>
- OS << format("0x%016" PRIx64, Addr) << ", " << KV.second.getFlags();<br>
+ OS << format("0x%016" PRIx64, Addr) << ", " << KV.second.getFlags()<br>
+ << " ";<br>
else<br>
- OS << "<not resolved>";<br>
- if (KV.second.getFlags().isLazy() ||<br>
- KV.second.getFlags().isMaterializing()) {<br>
- OS << " (";<br>
- if (KV.second.getFlags().isLazy()) {<br>
- auto I = UnmaterializedInfos.find(KV.first);<br>
- assert(I != UnmaterializedInfos.end() &&<br>
- "Lazy symbol should have UnmaterializedInfo");<br>
- OS << " Lazy (MU=" << I->second->MU.get() << ")";<br>
- }<br>
- if (KV.second.getFlags().isMaterializing())<br>
- OS << " Materializing";<br>
- OS << ", " << KV.second.getFlags() << " )\n";<br>
+ OS << "<not resolved> ";<br>
+<br>
+ switch (KV.second.getState()) {<br>
+ case SymbolState::Invalid:<br>
+ OS << "Invalid";<br>
+ break;<br>
+ case SymbolState::NeverSearched:<br>
+ OS << "Never-Searched";<br>
+ break;<br>
+ case SymbolState::Materializing:<br>
+ OS << "Materializing";<br>
+ break;<br>
+ case SymbolState::Resolved:<br>
+ OS << "Resolved";<br>
+ break;<br>
+ case SymbolState::Ready:<br>
+ OS << "Ready";<br>
+ break;<br>
+ // default: llvm_unreachable("Invalid state"); break;<br>
+ }<br>
+<br>
+ if (KV.second.hasMaterializerAttached()) {<br>
+ OS << " (Materializer ";<br>
+ auto I = UnmaterializedInfos.find(KV.first);<br>
+ assert(I != UnmaterializedInfos.end() &&<br>
+ "Lazy symbol should have UnmaterializedInfo");<br>
+ OS << I->second->MU.get() << ")\n";<br>
} else<br>
OS << "\n";<br>
}<br>
@@ -1505,21 +1481,17 @@ Error JITDylib::defineImpl(Materializati<br>
std::vector<SymbolStringPtr> MUDefsOverridden;<br>
<br>
for (const auto &KV : MU.getSymbols()) {<br>
- assert(!KV.second.isLazy() && "Lazy flag should be managed internally.");<br>
- assert(!KV.second.isMaterializing() &&<br>
- "Materializing flags should be managed internally.");<br>
-<br>
auto I = Symbols.find(KV.first);<br>
<br>
if (I != Symbols.end()) {<br>
if (KV.second.isStrong()) {<br>
if (I->second.getFlags().isStrong() ||<br>
- I->second.getFlags().isMaterializing())<br>
+ I->second.getState() > SymbolState::NeverSearched)<br>
Duplicates.insert(KV.first);<br>
else {<br>
- assert(I->second.getFlags().isLazy() &&<br>
- !I->second.getFlags().isMaterializing() &&<br>
- "Overridden existing def should be in the Lazy state");<br>
+ assert(I->second.getState() == SymbolState::NeverSearched &&<br>
+ "Overridden existing def should be in the never-searched "<br>
+ "state");<br>
ExistingDefsOverridden.push_back(KV.first);<br>
}<br>
} else<br>
@@ -1546,9 +1518,10 @@ Error JITDylib::defineImpl(Materializati<br>
<br>
// Finally, add the defs from this MU.<br>
for (auto &KV : MU.getSymbols()) {<br>
- auto NewFlags = KV.second;<br>
- NewFlags |= JITSymbolFlags::Lazy;<br>
- Symbols[KV.first] = JITEvaluatedSymbol(0, NewFlags);<br>
+ auto &SymEntry = Symbols[KV.first];<br>
+ SymEntry.setFlags(KV.second);<br>
+ SymEntry.setState(SymbolState::NeverSearched);<br>
+ SymEntry.setMaterializerAttached(true);<br>
}<br>
<br>
return Error::success();<br>
<br>
Modified: llvm/trunk/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp?rev=361899&r1=361898&r2=361899&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp?rev=361899&r1=361898&r2=361899&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp (original)<br>
+++ llvm/trunk/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp Tue May 28 16:35:44 2019<br>
@@ -175,7 +175,7 @@ Error RTDyldObjectLinkingLayer::onObjLoa<br>
auto I = R.getSymbols().find(InternedName);<br>
<br>
if (OverrideObjectFlags && I != R.getSymbols().end())<br>
- Flags = JITSymbolFlags::stripTransientFlags(I->second);<br>
+ Flags = I->second;<br>
else if (AutoClaimObjectSymbols && I == R.getSymbols().end())<br>
ExtraSymbolsToClaim[InternedName] = Flags;<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>