https://github.com/nikic created https://github.com/llvm/llvm-project/pull/229767
None >From 0324736c9f73d7d0c4647378aa9ec60391ccff31 Mon Sep 17 00:00:00 2001 From: Nikita Popov <[email protected]> Date: Wed, 7 Oct 2026 15:38:24 +0200 Subject: [PATCH] [IRBuilder] Use getDataLayout() in more places (NFC) --- clang/lib/CodeGen/CGBuilder.h | 14 +++++++------- llvm/include/llvm/IR/IRBuilder.h | 2 +- llvm/lib/IR/IRBuilder.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/clang/lib/CodeGen/CGBuilder.h b/clang/lib/CodeGen/CGBuilder.h index 2dc70a9071e96..fc23d19822882 100644 --- a/clang/lib/CodeGen/CGBuilder.h +++ b/clang/lib/CodeGen/CGBuilder.h @@ -65,7 +65,7 @@ class CGBuilderTy : public CGBuilderBaseTy { template <bool IsInBounds> Address createConstGEP2_32(Address Addr, unsigned Idx0, unsigned Idx1, const llvm::Twine &Name) { - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); llvm::Value *V; if (IsInBounds) V = CreateConstInBoundsGEP2_32(Addr.getElementType(), @@ -231,7 +231,7 @@ class CGBuilderTy : public CGBuilderBaseTy { Address CreateStructGEP(Address Addr, unsigned Index, const llvm::Twine &Name = "") { llvm::StructType *ElTy = cast<llvm::StructType>(Addr.getElementType()); - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); const llvm::StructLayout *Layout = DL.getStructLayout(ElTy); auto Offset = CharUnits::fromQuantity(Layout->getElementOffset(Index)); @@ -253,7 +253,7 @@ class CGBuilderTy : public CGBuilderBaseTy { Address CreateConstArrayGEP(Address Addr, uint64_t Index, const llvm::Twine &Name = "") { llvm::ArrayType *ElTy = cast<llvm::ArrayType>(Addr.getElementType()); - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); CharUnits EltSize = CharUnits::fromQuantity(DL.getTypeAllocSize(ElTy->getElementType())); @@ -273,7 +273,7 @@ class CGBuilderTy : public CGBuilderBaseTy { Address CreateConstInBoundsGEP(Address Addr, uint64_t Index, const llvm::Twine &Name = "") { llvm::Type *ElTy = Addr.getElementType(); - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); CharUnits EltSize = CharUnits::fromQuantity(DL.getTypeAllocSize(ElTy)); return Address( @@ -290,7 +290,7 @@ class CGBuilderTy : public CGBuilderBaseTy { Address CreateConstGEP(Address Addr, uint64_t Index, const llvm::Twine &Name = "") { llvm::Type *ElTy = Addr.getElementType(); - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); CharUnits EltSize = CharUnits::fromQuantity(DL.getTypeAllocSize(ElTy)); return Address(CreateGEP(ElTy, Addr.getBasePointer(), getSize(Index), Name), @@ -303,7 +303,7 @@ class CGBuilderTy : public CGBuilderBaseTy { using CGBuilderBaseTy::CreateGEP; Address CreateGEP(CodeGenFunction &CGF, Address Addr, llvm::Value *Index, const llvm::Twine &Name = "") { - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); CharUnits EltSize = CharUnits::fromQuantity(DL.getTypeAllocSize(Addr.getElementType())); @@ -448,7 +448,7 @@ class CGBuilderTy : public CGBuilderBaseTy { unsigned FieldIndex, llvm::MDNode *DbgInfo) { llvm::StructType *ElTy = cast<llvm::StructType>(Addr.getElementType()); - const llvm::DataLayout &DL = BB->getDataLayout(); + const llvm::DataLayout &DL = getDataLayout(); const llvm::StructLayout *Layout = DL.getStructLayout(ElTy); auto Offset = CharUnits::fromQuantity(Layout->getElementOffset(Index)); diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h index c370433331d5a..9a059b97eb96a 100644 --- a/llvm/include/llvm/IR/IRBuilder.h +++ b/llvm/include/llvm/IR/IRBuilder.h @@ -1892,7 +1892,7 @@ class IRBuilderBase { } CallInst *CreateStructuredAlloca(Type *BaseType, const Twine &Name = "") { - const DataLayout &DL = BB->getDataLayout(); + const DataLayout &DL = getDataLayout(); PointerType *PtrTy = DL.getAllocaPtrType(Context); auto *Output = CreateIntrinsicWithoutFolding(Intrinsic::structured_alloca, {PtrTy}, {}, {}, Name); diff --git a/llvm/lib/IR/IRBuilder.cpp b/llvm/lib/IR/IRBuilder.cpp index 07125506e6094..ed707552c54fd 100644 --- a/llvm/lib/IR/IRBuilder.cpp +++ b/llvm/lib/IR/IRBuilder.cpp @@ -214,7 +214,7 @@ Value *IRBuilderBase::CreateTypeSize(Type *Ty, TypeSize Size) { } Value *IRBuilderBase::CreateAllocationSize(Type *DestTy, AllocaInst *AI) { - const DataLayout &DL = BB->getDataLayout(); + const DataLayout &DL = getDataLayout(); TypeSize ElemSize = AI->getAllocationBaseSize(DL); Value *Size = CreateTypeSize(DestTy, ElemSize); if (AI->isArrayAllocation()) @@ -1186,7 +1186,7 @@ Value *IRBuilderBase::CreatePtrDiff(Value *LHS, Value *RHS, const Twine &Name, } Value *IRBuilderBase::CreatePtrDiff(Type *ElemTy, Value *LHS, Value *RHS, const Twine &Name) { - const DataLayout &DL = BB->getDataLayout(); + const DataLayout &DL = getDataLayout(); TypeSize ElemSize = DL.getTypeAllocSize(ElemTy); if (ElemSize == TypeSize::getFixed(1)) return CreatePtrDiff(LHS, RHS, Name); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
