Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion llvm/include/llvm/IR/FixedMetadataKinds.def
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ LLVM_FIXED_MD_KIND(MD_nofpclass, "nofpclass", 47)
LLVM_FIXED_MD_KIND(MD_call_target, "call_target", 48)
LLVM_FIXED_MD_KIND(MD_inline_history, "inline_history", 49)
LLVM_FIXED_MD_KIND(MD_elf_section_properties, "elf_section_properties", 50)
LLVM_FIXED_MD_KIND(MD_unique_id, "guid", 51)
LLVM_FIXED_MD_KIND(MD_guid, "guid", 51)
LLVM_FIXED_MD_KIND(MD_mem_cache_hint, "mem.cache_hint", 52)
LLVM_FIXED_MD_KIND(MD_block_uniformity_profile, "block.uniformity.profile", 53)
LLVM_FIXED_MD_KIND(MD_callgraph, "callgraph", 54)
Expand Down
8 changes: 4 additions & 4 deletions llvm/lib/IR/Globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ void GlobalValue::assignGUID() {
const GUID G =
GlobalValue::getGUIDAssumingExternalLinkage(getGlobalIdentifier());
setMetadata(
LLVMContext::MD_unique_id,
LLVMContext::MD_guid,
MDNode::get(getContext(), {ConstantAsMetadata::get(ConstantInt::get(
Type::getInt64Ty(getContext()), G))}));
}

void GlobalValue::reassignGUID() {
if (!getGUIDMetadata())
return;
eraseMetadata(LLVMContext::MD_unique_id);
eraseMetadata(LLVMContext::MD_guid);
assignGUID();
}

Expand Down Expand Up @@ -139,7 +139,7 @@ std::optional<GlobalValue::GUID> GlobalValue::getGUIDIfAssigned() const {

MDNode *GlobalValue::getGUIDMetadata() const {
if (auto *GO = dyn_cast<GlobalObject>(this))
return GO->getMetadata(LLVMContext::MD_unique_id);
return GO->getMetadata(LLVMContext::MD_guid);
return nullptr;
}

Expand Down Expand Up @@ -472,7 +472,7 @@ bool GlobalObject::hasMetadataOtherThanDebugLocAndGuid() const {
SmallVector<std::pair<unsigned, MDNode *>, 4> MDs;
getAllMetadata(MDs);
for (const auto &V : MDs)
if (V.first != LLVMContext::MD_dbg && V.first != LLVMContext::MD_unique_id)
if (V.first != LLVMContext::MD_dbg && V.first != LLVMContext::MD_guid)
return true;
return false;
}
Expand Down
6 changes: 3 additions & 3 deletions llvm/lib/Transforms/IPO/FunctionImport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1671,20 +1671,20 @@ bool llvm::convertToDeclaration(GlobalValue &GV) {
<< "\n");
MDNode *UniqueID = nullptr;
if (auto *GO = dyn_cast<GlobalObject>(&GV))
UniqueID = GO->getMetadata(LLVMContext::MD_unique_id);
UniqueID = GO->getMetadata(LLVMContext::MD_guid);

if (Function *F = dyn_cast<Function>(&GV)) {
F->deleteBody();
F->clearMetadata();
if (UniqueID)
F->setMetadata(LLVMContext::MD_unique_id, UniqueID);
F->setMetadata(LLVMContext::MD_guid, UniqueID);
F->setComdat(nullptr);
} else if (GlobalVariable *V = dyn_cast<GlobalVariable>(&GV)) {
V->setInitializer(nullptr);
V->setLinkage(GlobalValue::ExternalLinkage);
V->clearMetadata();
if (UniqueID)
V->setMetadata(LLVMContext::MD_unique_id, UniqueID);
V->setMetadata(LLVMContext::MD_guid, UniqueID);
V->setComdat(nullptr);
} else {
GlobalValue *NewGV;
Expand Down
6 changes: 3 additions & 3 deletions llvm/lib/Transforms/IPO/LowerTypeTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2274,7 +2274,7 @@ bool LowerTypeTestsModule::lower() {
GlobalVariable::ExternalLinkage,
M.getDataLayout().getProgramAddressSpace(), FunctionName, &M);
F->setMetadata(
LLVMContext::MD_unique_id,
LLVMContext::MD_guid,
MDTuple::get(M.getContext(), {FuncMD->getOperand(2).get()}));
}
// If the function is available_externally, remove its definition so
Expand All @@ -2284,12 +2284,12 @@ bool LowerTypeTestsModule::lower() {
// following the code path below to replace the type metadata.
if (F->hasAvailableExternallyLinkage()) {
// Maintain !guid metadata.
auto *OrigGUIDMD = F->getMetadata(LLVMContext::MD_unique_id);
auto *OrigGUIDMD = F->getMetadata(LLVMContext::MD_guid);
F->setLinkage(GlobalValue::ExternalLinkage);
F->deleteBody();
F->setComdat(nullptr);
F->clearMetadata();
F->setMetadata(LLVMContext::MD_unique_id, OrigGUIDMD);
F->setMetadata(LLVMContext::MD_guid, OrigGUIDMD);
}

// Update the linkage for extern_weak declarations when a definition
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ void simplifyExternals(Module &M) {
AttributeList::FunctionIndex,
F.getAttributes().getFnAttrs()));
NewF->takeName(&F);
NewF->setMetadata(LLVMContext::MD_unique_id,
F.getMetadata(LLVMContext::MD_unique_id));
NewF->setMetadata(LLVMContext::MD_guid,
F.getMetadata(LLVMContext::MD_guid));
F.replaceAllUsesWith(NewF);
F.eraseFromParent();
}
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Transforms/Utils/AssignGUID.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ void AssignGUIDPass::assignGUIDForMergedGV(GlobalVariable &GV) {
// that metadata from GV first, but we may want to remember those later, if
// we had a motivation for that. In that case, we need some other metadata
// to maintain that association.
GV.eraseMetadata(LLVMContext::MD_unique_id);
GV.eraseMetadata(LLVMContext::MD_guid);
GV.assignGUID();
}
4 changes: 2 additions & 2 deletions llvm/lib/Transforms/Utils/CloneModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ std::unique_ptr<Module> llvm::CloneModule(
}

if (!ShouldCloneDefinition(&I)) {
if (auto *MD = I.getMetadata(LLVMContext::MD_unique_id))
F->setMetadata(LLVMContext::MD_unique_id, MapMetadata(MD, VMap));
if (auto *MD = I.getMetadata(LLVMContext::MD_guid))
F->setMetadata(LLVMContext::MD_guid, MapMetadata(MD, VMap));
// Skip after setting the correct linkage for an external reference.
F->setLinkage(GlobalValue::ExternalLinkage);
// Personality function is not valid on a declaration.
Expand Down
Loading