Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 956a5a1

Browse files
mvillmowmvillmow
committed
Cleanup some clang code to use new type functions instead of using cast<>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166684 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 37c94bf commit 956a5a1

File tree

6 files changed

+16
-24
lines changed

6 files changed

+16
-24
lines changed

‎lib/CodeGen/CGBuiltin.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ static RValue EmitBinaryAtomic(CodeGenFunction &CGF,
8686
assert(CGF.getContext().hasSameUnqualifiedType(T, E->getArg(1)->getType()));
8787

8888
llvm::Value *DestPtr = CGF.EmitScalarExpr(E->getArg(0));
89-
unsigned AddrSpace =
90-
cast<llvm::PointerType>(DestPtr->getType())->getAddressSpace();
89+
unsigned AddrSpace = DestPtr->getType()->getPointerAddressSpace();
9190

9291
llvm::IntegerType *IntType =
9392
llvm::IntegerType::get(CGF.getLLVMContext(),
@@ -121,8 +120,7 @@ static RValue EmitBinaryAtomicPost(CodeGenFunction &CGF,
121120
assert(CGF.getContext().hasSameUnqualifiedType(T, E->getArg(1)->getType()));
122121

123122
llvm::Value *DestPtr = CGF.EmitScalarExpr(E->getArg(0));
124-
unsigned AddrSpace =
125-
cast<llvm::PointerType>(DestPtr->getType())->getAddressSpace();
123+
unsigned AddrSpace = DestPtr->getType()->getPointerAddressSpace();
126124

127125
llvm::IntegerType *IntType =
128126
llvm::IntegerType::get(CGF.getLLVMContext(),
@@ -918,8 +916,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
918916
case Builtin::BI__sync_val_compare_and_swap_16: {
919917
QualType T = E->getType();
920918
llvm::Value *DestPtr = EmitScalarExpr(E->getArg(0));
921-
unsigned AddrSpace =
922-
cast<llvm::PointerType>(DestPtr->getType())->getAddressSpace();
919+
unsigned AddrSpace = DestPtr->getType()->getPointerAddressSpace();
923920

924921
llvm::IntegerType *IntType =
925922
llvm::IntegerType::get(getLLVMContext(),
@@ -946,8 +943,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
946943
case Builtin::BI__sync_bool_compare_and_swap_16: {
947944
QualType T = E->getArg(1)->getType();
948945
llvm::Value *DestPtr = EmitScalarExpr(E->getArg(0));
949-
unsigned AddrSpace =
950-
cast<llvm::PointerType>(DestPtr->getType())->getAddressSpace();
946+
unsigned AddrSpace = DestPtr->getType()->getPointerAddressSpace();
951947

952948
llvm::IntegerType *IntType =
953949
llvm::IntegerType::get(getLLVMContext(),
@@ -1044,8 +1040,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
10441040
PtrTy->castAs<PointerType>()->getPointeeType().isVolatileQualified();
10451041

10461042
Value *Ptr = EmitScalarExpr(E->getArg(0));
1047-
unsigned AddrSpace =
1048-
cast<llvm::PointerType>(Ptr->getType())->getAddressSpace();
1043+
unsigned AddrSpace = Ptr->getType()->getPointerAddressSpace();
10491044
Ptr = Builder.CreateBitCast(Ptr, Int8Ty->getPointerTo(AddrSpace));
10501045
Value *NewVal = Builder.getInt8(1);
10511046
Value *Order = EmitScalarExpr(E->getArg(1));
@@ -1131,8 +1126,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
11311126
PtrTy->castAs<PointerType>()->getPointeeType().isVolatileQualified();
11321127

11331128
Value *Ptr = EmitScalarExpr(E->getArg(0));
1134-
unsigned AddrSpace =
1135-
cast<llvm::PointerType>(Ptr->getType())->getAddressSpace();
1129+
unsigned AddrSpace = Ptr->getType()->getPointerAddressSpace();
11361130
Ptr = Builder.CreateBitCast(Ptr, Int8Ty->getPointerTo(AddrSpace));
11371131
Value *NewVal = Builder.getInt8(0);
11381132
Value *Order = EmitScalarExpr(E->getArg(1));

‎lib/CodeGen/CGCXXABI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void CGCXXABI::ReadArrayCookie(CodeGenFunction &CGF, llvm::Value *ptr,
189189
llvm::Value *&numElements,
190190
llvm::Value *&allocPtr, CharUnits &cookieSize) {
191191
// Derive a char* in the same address space as the pointer.
192-
unsigned AS = cast<llvm::PointerType>(ptr->getType())->getAddressSpace();
192+
unsigned AS = ptr->getType()->getPointerAddressSpace();
193193
llvm::Type *charPtrTy = CGF.Int8Ty->getPointerTo(AS);
194194
ptr = CGF.Builder.CreateBitCast(ptr, charPtrTy);
195195

‎lib/CodeGen/CGExprCXX.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,8 +1239,7 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) {
12391239
llvm::BasicBlock *contBB = 0;
12401240

12411241
llvm::Value *allocation = RV.getScalarVal();
1242-
unsigned AS =
1243-
cast<llvm::PointerType>(allocation->getType())->getAddressSpace();
1242+
unsigned AS = allocation->getType()->getPointerAddressSpace();
12441243

12451244
// The null-check means that the initializer is conditionally
12461245
// evaluated.

‎lib/CodeGen/CodeGenFunction.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,8 +1001,7 @@ llvm::Value *CodeGenFunction::emitArrayLength(const ArrayType *origArrayType,
10011001
arrayType = getContext().getAsArrayType(eltType);
10021002
}
10031003

1004-
unsigned AddressSpace =
1005-
cast<llvm::PointerType>(addr->getType())->getAddressSpace();
1004+
unsigned AddressSpace = addr->getType()->getPointerAddressSpace();
10061005
llvm::Type *BaseType = ConvertType(eltType)->getPointerTo(AddressSpace);
10071006
addr = Builder.CreateBitCast(addr, BaseType, "array.begin");
10081007
} else {

‎lib/CodeGen/ItaniumCXXABI.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ llvm::Value *ItaniumCXXABI::EmitMemberDataPointerAddress(CodeGenFunction &CGF,
304304

305305
CGBuilderTy &Builder = CGF.Builder;
306306

307-
unsigned AS = cast<llvm::PointerType>(Base->getType())->getAddressSpace();
307+
unsigned AS = Base->getType()->getPointerAddressSpace();
308308

309309
// Cast to char*.
310310
Base = Builder.CreateBitCast(Base, Builder.getInt8Ty()->getPointerTo(AS));
@@ -834,7 +834,7 @@ llvm::Value *ItaniumCXXABI::InitializeArrayCookie(CodeGenFunction &CGF,
834834
QualType ElementType) {
835835
assert(requiresArrayCookie(expr));
836836

837-
unsigned AS = cast<llvm::PointerType>(NewPtr->getType())->getAddressSpace();
837+
unsigned AS = NewPtr->getType()->getPointerAddressSpace();
838838

839839
ASTContext &Ctx = getContext();
840840
QualType SizeTy = Ctx.getSizeType();
@@ -876,7 +876,7 @@ llvm::Value *ItaniumCXXABI::readArrayCookieImpl(CodeGenFunction &CGF,
876876
CGF.Builder.CreateConstInBoundsGEP1_64(numElementsPtr,
877877
numElementsOffset.getQuantity());
878878

879-
unsigned AS = cast<llvm::PointerType>(allocPtr->getType())->getAddressSpace();
879+
unsigned AS = allocPtr->getType()->getPointerAddressSpace();
880880
numElementsPtr =
881881
CGF.Builder.CreateBitCast(numElementsPtr, CGF.SizeTy->getPointerTo(AS));
882882
return CGF.Builder.CreateLoad(numElementsPtr);
@@ -902,7 +902,7 @@ llvm::Value *ARMCXXABI::InitializeArrayCookie(CodeGenFunction &CGF,
902902

903903
// NewPtr is a char*.
904904

905-
unsigned AS = cast<llvm::PointerType>(NewPtr->getType())->getAddressSpace();
905+
unsigned AS = NewPtr->getType()->getPointerAddressSpace();
906906

907907
ASTContext &Ctx = getContext();
908908
CharUnits SizeSize = Ctx.getTypeSizeInChars(Ctx.getSizeType());
@@ -937,7 +937,7 @@ llvm::Value *ARMCXXABI::readArrayCookieImpl(CodeGenFunction &CGF,
937937
llvm::Value *numElementsPtr
938938
= CGF.Builder.CreateConstInBoundsGEP1_64(allocPtr, CGF.SizeSizeInBytes);
939939

940-
unsigned AS = cast<llvm::PointerType>(allocPtr->getType())->getAddressSpace();
940+
unsigned AS = allocPtr->getType()->getPointerAddressSpace();
941941
numElementsPtr =
942942
CGF.Builder.CreateBitCast(numElementsPtr, CGF.SizeTy->getPointerTo(AS));
943943
return CGF.Builder.CreateLoad(numElementsPtr);

‎lib/CodeGen/MicrosoftCXXABI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ CharUnits MicrosoftCXXABI::getArrayCookieSizeImpl(QualType type) {
164164
llvm::Value *MicrosoftCXXABI::readArrayCookieImpl(CodeGenFunction &CGF,
165165
llvm::Value *allocPtr,
166166
CharUnits cookieSize) {
167-
unsigned AS = cast<llvm::PointerType>(allocPtr->getType())->getAddressSpace();
167+
unsigned AS = allocPtr->getType()->getPointerAddressSpace();
168168
llvm::Value *numElementsPtr =
169169
CGF.Builder.CreateBitCast(allocPtr, CGF.SizeTy->getPointerTo(AS));
170170
return CGF.Builder.CreateLoad(numElementsPtr);
@@ -184,7 +184,7 @@ llvm::Value* MicrosoftCXXABI::InitializeArrayCookie(CodeGenFunction &CGF,
184184
llvm::Value *cookiePtr = newPtr;
185185

186186
// Write the number of elements into the appropriate slot.
187-
unsigned AS = cast<llvm::PointerType>(newPtr->getType())->getAddressSpace();
187+
unsigned AS = newPtr->getType()->getPointerAddressSpace();
188188
llvm::Value *numElementsPtr
189189
= CGF.Builder.CreateBitCast(cookiePtr, CGF.SizeTy->getPointerTo(AS));
190190
CGF.Builder.CreateStore(numElements, numElementsPtr);

0 commit comments

Comments
 (0)