[llvm] d71a8ad - [llvm-c] Harmonize usage of unwrap (NFC)
Aaron Puchert via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 1 14:54:40 PDT 2022
Author: Aaron Puchert
Date: 2022-11-01T22:52:23+01:00
New Revision: d71a8ad3460f1a04686f7087a44c1fef64311239
URL: https://github.com/llvm/llvm-project/commit/d71a8ad3460f1a04686f7087a44c1fef64311239
DIFF: https://github.com/llvm/llvm-project/commit/d71a8ad3460f1a04686f7087a44c1fef64311239.diff
LOG: [llvm-c] Harmonize usage of unwrap (NFC)
Some places were using unwrap<T>(x) = cast<T>(unwrap(x)), even though
the unwrapped value already had type T. Removing the template argument
makes it clear that no cast is intended.
Other places were using cast<T>(unwrap(x)), we replace that with the
shorthand unwrap<T>(x) for consistency.
Added:
Modified:
llvm/lib/IR/Core.cpp
llvm/lib/IR/DebugInfo.cpp
Removed:
################################################################################
diff --git a/llvm/lib/IR/Core.cpp b/llvm/lib/IR/Core.cpp
index 45676a4617061..e7e1dce41bd87 100644
--- a/llvm/lib/IR/Core.cpp
+++ b/llvm/lib/IR/Core.cpp
@@ -797,7 +797,7 @@ LLVMTypeRef LLVMScalableVectorType(LLVMTypeRef ElementType,
}
LLVMTypeRef LLVMGetElementType(LLVMTypeRef WrappedTy) {
- auto *Ty = unwrap<Type>(WrappedTy);
+ auto *Ty = unwrap(WrappedTy);
if (auto *PTy = dyn_cast<PointerType>(Ty))
return wrap(PTy->getNonOpaquePointerElementType());
if (auto *ATy = dyn_cast<ArrayType>(Ty))
@@ -1181,7 +1181,7 @@ const char *LLVMGetMDString(LLVMValueRef V, unsigned *Length) {
}
unsigned LLVMGetMDNodeNumOperands(LLVMValueRef V) {
- auto *MD = cast<MetadataAsValue>(unwrap(V));
+ auto *MD = unwrap<MetadataAsValue>(V);
if (isa<ValueAsMetadata>(MD->getMetadata()))
return 1;
return cast<MDNode>(MD->getMetadata())->getNumOperands();
@@ -1204,7 +1204,7 @@ LLVMNamedMDNodeRef LLVMGetLastNamedMetadata(LLVMModuleRef M) {
}
LLVMNamedMDNodeRef LLVMGetNextNamedMetadata(LLVMNamedMDNodeRef NMD) {
- NamedMDNode *NamedNode = unwrap<NamedMDNode>(NMD);
+ NamedMDNode *NamedNode = unwrap(NMD);
Module::named_metadata_iterator I(NamedNode);
if (++I == NamedNode->getParent()->named_metadata_end())
return nullptr;
@@ -1212,7 +1212,7 @@ LLVMNamedMDNodeRef LLVMGetNextNamedMetadata(LLVMNamedMDNodeRef NMD) {
}
LLVMNamedMDNodeRef LLVMGetPreviousNamedMetadata(LLVMNamedMDNodeRef NMD) {
- NamedMDNode *NamedNode = unwrap<NamedMDNode>(NMD);
+ NamedMDNode *NamedNode = unwrap(NMD);
Module::named_metadata_iterator I(NamedNode);
if (I == NamedNode->getParent()->named_metadata_begin())
return nullptr;
@@ -1230,13 +1230,13 @@ LLVMNamedMDNodeRef LLVMGetOrInsertNamedMetadata(LLVMModuleRef M,
}
const char *LLVMGetNamedMetadataName(LLVMNamedMDNodeRef NMD, size_t *NameLen) {
- NamedMDNode *NamedNode = unwrap<NamedMDNode>(NMD);
+ NamedMDNode *NamedNode = unwrap(NMD);
*NameLen = NamedNode->getName().size();
return NamedNode->getName().data();
}
void LLVMGetMDNodeOperands(LLVMValueRef V, LLVMValueRef *Dest) {
- auto *MD = cast<MetadataAsValue>(unwrap(V));
+ auto *MD = unwrap<MetadataAsValue>(V);
if (auto *MDV = dyn_cast<ValueAsMetadata>(MD->getMetadata())) {
*Dest = wrap(MDV->getValue());
return;
@@ -1478,7 +1478,7 @@ LLVMValueRef LLVMConstNamedStruct(LLVMTypeRef StructTy,
LLVMValueRef *ConstantVals,
unsigned Count) {
Constant **Elements = unwrap<Constant>(ConstantVals, Count);
- StructType *Ty = cast<StructType>(unwrap(StructTy));
+ StructType *Ty = unwrap<StructType>(StructTy);
return wrap(ConstantStruct::get(Ty, makeArrayRef(Elements, Count)));
}
@@ -1993,7 +1993,7 @@ LLVMTypeRef LLVMGlobalGetValueType(LLVMValueRef Global) {
/*--.. Operations on global variables, load and store instructions .........--*/
unsigned LLVMGetAlignment(LLVMValueRef V) {
- Value *P = unwrap<Value>(V);
+ Value *P = unwrap(V);
if (GlobalObject *GV = dyn_cast<GlobalObject>(P))
return GV->getAlign() ? GV->getAlign()->value() : 0;
if (AllocaInst *AI = dyn_cast<AllocaInst>(P))
@@ -2013,7 +2013,7 @@ unsigned LLVMGetAlignment(LLVMValueRef V) {
}
void LLVMSetAlignment(LLVMValueRef V, unsigned Bytes) {
- Value *P = unwrap<Value>(V);
+ Value *P = unwrap(V);
if (GlobalObject *GV = dyn_cast<GlobalObject>(P))
GV->setAlignment(MaybeAlign(Bytes));
else if (AllocaInst *AI = dyn_cast<AllocaInst>(P))
@@ -2211,7 +2211,7 @@ void LLVMSetExternallyInitialized(LLVMValueRef GlobalVar, LLVMBool IsExtInit) {
LLVMValueRef LLVMAddAlias(LLVMModuleRef M, LLVMTypeRef Ty, LLVMValueRef Aliasee,
const char *Name) {
- auto *PTy = cast<PointerType>(unwrap(Ty));
+ auto *PTy = unwrap<PointerType>(Ty);
return wrap(GlobalAlias::create(PTy->getNonOpaquePointerElementType(),
PTy->getAddressSpace(),
GlobalValue::ExternalLinkage, Name,
@@ -3177,7 +3177,7 @@ LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
// personality and put it on the parent function.
if (PersFn)
unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn(
- cast<Function>(unwrap(PersFn)));
+ unwrap<Function>(PersFn));
return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name));
}
@@ -3250,8 +3250,7 @@ LLVMValueRef LLVMGetClause(LLVMValueRef LandingPad, unsigned Idx) {
}
void LLVMAddClause(LLVMValueRef LandingPad, LLVMValueRef ClauseVal) {
- unwrap<LandingPadInst>(LandingPad)->
- addClause(cast<Constant>(unwrap(ClauseVal)));
+ unwrap<LandingPadInst>(LandingPad)->addClause(unwrap<Constant>(ClauseVal));
}
LLVMBool LLVMIsCleanup(LLVMValueRef LandingPad) {
@@ -3685,7 +3684,7 @@ LLVMValueRef LLVMBuildGlobalStringPtr(LLVMBuilderRef B, const char *Str,
}
LLVMBool LLVMGetVolatile(LLVMValueRef MemAccessInst) {
- Value *P = unwrap<Value>(MemAccessInst);
+ Value *P = unwrap(MemAccessInst);
if (LoadInst *LI = dyn_cast<LoadInst>(P))
return LI->isVolatile();
if (StoreInst *SI = dyn_cast<StoreInst>(P))
@@ -3696,7 +3695,7 @@ LLVMBool LLVMGetVolatile(LLVMValueRef MemAccessInst) {
}
void LLVMSetVolatile(LLVMValueRef MemAccessInst, LLVMBool isVolatile) {
- Value *P = unwrap<Value>(MemAccessInst);
+ Value *P = unwrap(MemAccessInst);
if (LoadInst *LI = dyn_cast<LoadInst>(P))
return LI->setVolatile(isVolatile);
if (StoreInst *SI = dyn_cast<StoreInst>(P))
@@ -3715,7 +3714,7 @@ void LLVMSetWeak(LLVMValueRef CmpXchgInst, LLVMBool isWeak) {
}
LLVMAtomicOrdering LLVMGetOrdering(LLVMValueRef MemAccessInst) {
- Value *P = unwrap<Value>(MemAccessInst);
+ Value *P = unwrap(MemAccessInst);
AtomicOrdering O;
if (LoadInst *LI = dyn_cast<LoadInst>(P))
O = LI->getOrdering();
@@ -3727,7 +3726,7 @@ LLVMAtomicOrdering LLVMGetOrdering(LLVMValueRef MemAccessInst) {
}
void LLVMSetOrdering(LLVMValueRef MemAccessInst, LLVMAtomicOrdering Ordering) {
- Value *P = unwrap<Value>(MemAccessInst);
+ Value *P = unwrap(MemAccessInst);
AtomicOrdering O = mapFromLLVMOrdering(Ordering);
if (LoadInst *LI = dyn_cast<LoadInst>(P))
@@ -4002,13 +4001,13 @@ LLVMValueRef LLVMBuildAtomicCmpXchg(LLVMBuilderRef B, LLVMValueRef Ptr,
}
unsigned LLVMGetNumMaskElements(LLVMValueRef SVInst) {
- Value *P = unwrap<Value>(SVInst);
+ Value *P = unwrap(SVInst);
ShuffleVectorInst *I = cast<ShuffleVectorInst>(P);
return I->getShuffleMask().size();
}
int LLVMGetMaskValue(LLVMValueRef SVInst, unsigned Elt) {
- Value *P = unwrap<Value>(SVInst);
+ Value *P = unwrap(SVInst);
ShuffleVectorInst *I = cast<ShuffleVectorInst>(P);
return I->getMaskValue(Elt);
}
@@ -4016,7 +4015,7 @@ int LLVMGetMaskValue(LLVMValueRef SVInst, unsigned Elt) {
int LLVMGetUndefMaskElem(void) { return UndefMaskElem; }
LLVMBool LLVMIsAtomicSingleThread(LLVMValueRef AtomicInst) {
- Value *P = unwrap<Value>(AtomicInst);
+ Value *P = unwrap(AtomicInst);
if (AtomicRMWInst *I = dyn_cast<AtomicRMWInst>(P))
return I->getSyncScopeID() == SyncScope::SingleThread;
@@ -4025,7 +4024,7 @@ LLVMBool LLVMIsAtomicSingleThread(LLVMValueRef AtomicInst) {
}
void LLVMSetAtomicSingleThread(LLVMValueRef AtomicInst, LLVMBool NewValue) {
- Value *P = unwrap<Value>(AtomicInst);
+ Value *P = unwrap(AtomicInst);
SyncScope::ID SSID = NewValue ? SyncScope::SingleThread : SyncScope::System;
if (AtomicRMWInst *I = dyn_cast<AtomicRMWInst>(P))
@@ -4034,26 +4033,26 @@ void LLVMSetAtomicSingleThread(LLVMValueRef AtomicInst, LLVMBool NewValue) {
}
LLVMAtomicOrdering LLVMGetCmpXchgSuccessOrdering(LLVMValueRef CmpXchgInst) {
- Value *P = unwrap<Value>(CmpXchgInst);
+ Value *P = unwrap(CmpXchgInst);
return mapToLLVMOrdering(cast<AtomicCmpXchgInst>(P)->getSuccessOrdering());
}
void LLVMSetCmpXchgSuccessOrdering(LLVMValueRef CmpXchgInst,
LLVMAtomicOrdering Ordering) {
- Value *P = unwrap<Value>(CmpXchgInst);
+ Value *P = unwrap(CmpXchgInst);
AtomicOrdering O = mapFromLLVMOrdering(Ordering);
return cast<AtomicCmpXchgInst>(P)->setSuccessOrdering(O);
}
LLVMAtomicOrdering LLVMGetCmpXchgFailureOrdering(LLVMValueRef CmpXchgInst) {
- Value *P = unwrap<Value>(CmpXchgInst);
+ Value *P = unwrap(CmpXchgInst);
return mapToLLVMOrdering(cast<AtomicCmpXchgInst>(P)->getFailureOrdering());
}
void LLVMSetCmpXchgFailureOrdering(LLVMValueRef CmpXchgInst,
LLVMAtomicOrdering Ordering) {
- Value *P = unwrap<Value>(CmpXchgInst);
+ Value *P = unwrap(CmpXchgInst);
AtomicOrdering O = mapFromLLVMOrdering(Ordering);
return cast<AtomicCmpXchgInst>(P)->setFailureOrdering(O);
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index 5752233ed2d97..be09d14adf0ee 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -1498,7 +1498,7 @@ void LLVMDisposeTemporaryMDNode(LLVMMetadataRef TempNode) {
void LLVMMetadataReplaceAllUsesWith(LLVMMetadataRef TargetMetadata,
LLVMMetadataRef Replacement) {
auto *Node = unwrapDI<MDNode>(TargetMetadata);
- Node->replaceAllUsesWith(unwrap<Metadata>(Replacement));
+ Node->replaceAllUsesWith(unwrap(Replacement));
MDNode::deleteTemporary(Node);
}
More information about the llvm-commits
mailing list