[llvm] r332899 - [ORC] Preserve Materializing symbol flag during resolution.

[Lang Hames via llvm-commits]

Author: lhames
Date: Mon May 21 14:11:22 2018
New Revision: 332899

URL: http://llvm.org/viewvc/llvm-project?rev=332899&view=rev
Log:
[ORC] Preserve Materializing symbol flag during resolution.

Modified:
    llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp

Modified: llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp?rev=332899&r1=332898&r2=332899&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp Mon May 21 14:11:22 2018
@@ -456,9 +456,10 @@ void VSO::resolve(const SymbolMap &Resol
              "Resolved flags should match the declared flags");
 
       // Once resolved, symbols can never be weak.
-      Sym.getFlags() = static_cast<JITSymbolFlags::FlagNames>(
-          Sym.getFlags() & ~JITSymbolFlags::Weak);
-      I->second = Sym;
+      JITSymbolFlags ResolvedFlags = Sym.getFlags();
+      ResolvedFlags &= ~JITSymbolFlags::Weak;
+      ResolvedFlags |= JITSymbolFlags::Materializing;
+      I->second = JITEvaluatedSymbol(Sym.getAddress(), ResolvedFlags);
 
       auto &MI = MaterializingInfos[Name];
       for (auto &Q : MI.PendingQueries) {