From d71a8ad3460f1a04686f7087a44c1fef64311239 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Tue, 1 Nov 2022 22:26:40 +0100 Subject: [PATCH] [llvm-c] Harmonize usage of unwrap (NFC) Some places were using unwrap(x) = cast(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(unwrap(x)), we replace that with the shorthand unwrap(x) for consistency. --- llvm/lib/IR/Core.cpp | 49 +++++++++++++++++++++++------------------------ llvm/lib/IR/DebugInfo.cpp | 2 +- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/llvm/lib/IR/Core.cpp b/llvm/lib/IR/Core.cpp index 45676a4..e7e1dce 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(WrappedTy); + auto *Ty = unwrap(WrappedTy); if (auto *PTy = dyn_cast(Ty)) return wrap(PTy->getNonOpaquePointerElementType()); if (auto *ATy = dyn_cast(Ty)) @@ -1181,7 +1181,7 @@ const char *LLVMGetMDString(LLVMValueRef V, unsigned *Length) { } unsigned LLVMGetMDNodeNumOperands(LLVMValueRef V) { - auto *MD = cast(unwrap(V)); + auto *MD = unwrap(V); if (isa(MD->getMetadata())) return 1; return cast(MD->getMetadata())->getNumOperands(); @@ -1204,7 +1204,7 @@ LLVMNamedMDNodeRef LLVMGetLastNamedMetadata(LLVMModuleRef M) { } LLVMNamedMDNodeRef LLVMGetNextNamedMetadata(LLVMNamedMDNodeRef NMD) { - NamedMDNode *NamedNode = unwrap(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(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(NMD); + NamedMDNode *NamedNode = unwrap(NMD); *NameLen = NamedNode->getName().size(); return NamedNode->getName().data(); } void LLVMGetMDNodeOperands(LLVMValueRef V, LLVMValueRef *Dest) { - auto *MD = cast(unwrap(V)); + auto *MD = unwrap(V); if (auto *MDV = dyn_cast(MD->getMetadata())) { *Dest = wrap(MDV->getValue()); return; @@ -1478,7 +1478,7 @@ LLVMValueRef LLVMConstNamedStruct(LLVMTypeRef StructTy, LLVMValueRef *ConstantVals, unsigned Count) { Constant **Elements = unwrap(ConstantVals, Count); - StructType *Ty = cast(unwrap(StructTy)); + StructType *Ty = unwrap(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(V); + Value *P = unwrap(V); if (GlobalObject *GV = dyn_cast(P)) return GV->getAlign() ? GV->getAlign()->value() : 0; if (AllocaInst *AI = dyn_cast(P)) @@ -2013,7 +2013,7 @@ unsigned LLVMGetAlignment(LLVMValueRef V) { } void LLVMSetAlignment(LLVMValueRef V, unsigned Bytes) { - Value *P = unwrap(V); + Value *P = unwrap(V); if (GlobalObject *GV = dyn_cast(P)) GV->setAlignment(MaybeAlign(Bytes)); else if (AllocaInst *AI = dyn_cast(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(unwrap(Ty)); + auto *PTy = unwrap(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(unwrap(PersFn))); + unwrap(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(LandingPad)-> - addClause(cast(unwrap(ClauseVal))); + unwrap(LandingPad)->addClause(unwrap(ClauseVal)); } LLVMBool LLVMIsCleanup(LLVMValueRef LandingPad) { @@ -3685,7 +3684,7 @@ LLVMValueRef LLVMBuildGlobalStringPtr(LLVMBuilderRef B, const char *Str, } LLVMBool LLVMGetVolatile(LLVMValueRef MemAccessInst) { - Value *P = unwrap(MemAccessInst); + Value *P = unwrap(MemAccessInst); if (LoadInst *LI = dyn_cast(P)) return LI->isVolatile(); if (StoreInst *SI = dyn_cast(P)) @@ -3696,7 +3695,7 @@ LLVMBool LLVMGetVolatile(LLVMValueRef MemAccessInst) { } void LLVMSetVolatile(LLVMValueRef MemAccessInst, LLVMBool isVolatile) { - Value *P = unwrap(MemAccessInst); + Value *P = unwrap(MemAccessInst); if (LoadInst *LI = dyn_cast(P)) return LI->setVolatile(isVolatile); if (StoreInst *SI = dyn_cast(P)) @@ -3715,7 +3714,7 @@ void LLVMSetWeak(LLVMValueRef CmpXchgInst, LLVMBool isWeak) { } LLVMAtomicOrdering LLVMGetOrdering(LLVMValueRef MemAccessInst) { - Value *P = unwrap(MemAccessInst); + Value *P = unwrap(MemAccessInst); AtomicOrdering O; if (LoadInst *LI = dyn_cast(P)) O = LI->getOrdering(); @@ -3727,7 +3726,7 @@ LLVMAtomicOrdering LLVMGetOrdering(LLVMValueRef MemAccessInst) { } void LLVMSetOrdering(LLVMValueRef MemAccessInst, LLVMAtomicOrdering Ordering) { - Value *P = unwrap(MemAccessInst); + Value *P = unwrap(MemAccessInst); AtomicOrdering O = mapFromLLVMOrdering(Ordering); if (LoadInst *LI = dyn_cast(P)) @@ -4002,13 +4001,13 @@ LLVMValueRef LLVMBuildAtomicCmpXchg(LLVMBuilderRef B, LLVMValueRef Ptr, } unsigned LLVMGetNumMaskElements(LLVMValueRef SVInst) { - Value *P = unwrap(SVInst); + Value *P = unwrap(SVInst); ShuffleVectorInst *I = cast(P); return I->getShuffleMask().size(); } int LLVMGetMaskValue(LLVMValueRef SVInst, unsigned Elt) { - Value *P = unwrap(SVInst); + Value *P = unwrap(SVInst); ShuffleVectorInst *I = cast(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(AtomicInst); + Value *P = unwrap(AtomicInst); if (AtomicRMWInst *I = dyn_cast(P)) return I->getSyncScopeID() == SyncScope::SingleThread; @@ -4025,7 +4024,7 @@ LLVMBool LLVMIsAtomicSingleThread(LLVMValueRef AtomicInst) { } void LLVMSetAtomicSingleThread(LLVMValueRef AtomicInst, LLVMBool NewValue) { - Value *P = unwrap(AtomicInst); + Value *P = unwrap(AtomicInst); SyncScope::ID SSID = NewValue ? SyncScope::SingleThread : SyncScope::System; if (AtomicRMWInst *I = dyn_cast(P)) @@ -4034,26 +4033,26 @@ void LLVMSetAtomicSingleThread(LLVMValueRef AtomicInst, LLVMBool NewValue) { } LLVMAtomicOrdering LLVMGetCmpXchgSuccessOrdering(LLVMValueRef CmpXchgInst) { - Value *P = unwrap(CmpXchgInst); + Value *P = unwrap(CmpXchgInst); return mapToLLVMOrdering(cast(P)->getSuccessOrdering()); } void LLVMSetCmpXchgSuccessOrdering(LLVMValueRef CmpXchgInst, LLVMAtomicOrdering Ordering) { - Value *P = unwrap(CmpXchgInst); + Value *P = unwrap(CmpXchgInst); AtomicOrdering O = mapFromLLVMOrdering(Ordering); return cast(P)->setSuccessOrdering(O); } LLVMAtomicOrdering LLVMGetCmpXchgFailureOrdering(LLVMValueRef CmpXchgInst) { - Value *P = unwrap(CmpXchgInst); + Value *P = unwrap(CmpXchgInst); return mapToLLVMOrdering(cast(P)->getFailureOrdering()); } void LLVMSetCmpXchgFailureOrdering(LLVMValueRef CmpXchgInst, LLVMAtomicOrdering Ordering) { - Value *P = unwrap(CmpXchgInst); + Value *P = unwrap(CmpXchgInst); AtomicOrdering O = mapFromLLVMOrdering(Ordering); return cast(P)->setFailureOrdering(O); diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp index 5752233..be09d14 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(TargetMetadata); - Node->replaceAllUsesWith(unwrap(Replacement)); + Node->replaceAllUsesWith(unwrap(Replacement)); MDNode::deleteTemporary(Node); } -- 2.7.4