diff options
| -rw-r--r-- | llvm/include/llvm/IR/ValueMap.h | 1 | ||||
| -rw-r--r-- | llvm/lib/Linker/IRMover.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/include/llvm/IR/ValueMap.h b/llvm/include/llvm/IR/ValueMap.h index 043e813b09b..85379ad468c 100644 --- a/llvm/include/llvm/IR/ValueMap.h +++ b/llvm/include/llvm/IR/ValueMap.h @@ -109,6 +109,7 @@ public: MDMap.emplace(); return *MDMap; } + Optional<MDMapT> &getMDMap() { return MDMap; } bool mayMapMetadata() const { return MayMapMetadata; } void enableMapMetadata() { MayMapMetadata = true; } diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index 81858bd421f..b4d91d186e1 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -483,11 +483,11 @@ public: &GValMaterializer), AliasMCID(Mapper.registerAlternateMappingContext(AliasValueMap, &LValMaterializer)) { - ValueMap.MD().swap(SharedMDs); + ValueMap.getMDMap() = std::move(SharedMDs); for (GlobalValue *GV : ValuesToLink) maybeAdd(GV); } - ~IRLinker() { ValueMap.MD().swap(SharedMDs); } + ~IRLinker() { SharedMDs = std::move(*ValueMap.getMDMap()); } bool run(); Value *materializeDeclFor(Value *V, bool ForAlias); |
