Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion llvm/lib/Linker/IRMover.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include "llvm/Linker/IRMover.h"
#include "LinkDiagnosticInfo.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/IR/AutoUpgrade.h"
Expand Down Expand Up @@ -290,6 +292,9 @@ class IRLinker {
Module &DstM;
std::unique_ptr<Module> SrcM;

// Lookup table to optimize IRMover::linkNamedMDNodes().
DenseMap<StringRef, DenseSet<MDNode *>> NamedMDNodes;

/// See IRMover::move().
IRMover::LazyCallback AddLazyFor;

Expand Down Expand Up @@ -1132,12 +1137,20 @@ void IRLinker::linkNamedMDNodes() {
continue;

NamedMDNode *DestNMD = DstM.getOrInsertNamedMetadata(NMD.getName());

auto &Inserted = NamedMDNodes[DestNMD->getName()];
if (Inserted.empty()) {
// Must be the first module, copy everything from DestNMD.
Inserted.insert(DestNMD->operands().begin(), DestNMD->operands().end());
}

// Add Src elements into Dest node.
for (const MDNode *Op : NMD.operands()) {
MDNode *MD = Mapper.mapMDNode(*Op);
if (!is_contained(DestNMD->operands(), MD))
if (Inserted.insert(MD).second)
DestNMD->addOperand(MD);
}
assert(Inserted.size() == DestNMD->getNumOperands());
}
}

Expand Down