diff options
| author | Lang Hames <lhames@gmail.com> | 2018-05-21 21:11:22 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2018-05-21 21:11:22 +0000 |
| commit | 502f81e37ed17d7f67b8f5e0faba9bda37f5ac26 (patch) | |
| tree | 59d65c8caad88274dfba2358ba3ccc23fd78ed63 /llvm | |
| parent | 0b0b41fccefbcd275dee6282b384abfb4ad03266 (diff) | |
| download | bcm5719-llvm-502f81e37ed17d7f67b8f5e0faba9bda37f5ac26.tar.gz bcm5719-llvm-502f81e37ed17d7f67b8f5e0faba9bda37f5ac26.zip | |
[ORC] Preserve Materializing symbol flag during resolution.
llvm-svn: 332899
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/Core.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/Core.cpp b/llvm/lib/ExecutionEngine/Orc/Core.cpp index 760e2561ba6..bae4977f36a 100644 --- a/llvm/lib/ExecutionEngine/Orc/Core.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Core.cpp @@ -456,9 +456,10 @@ void VSO::resolve(const SymbolMap &Resolved) { "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) { |
