Skip to content

[Clang][CodeGen] Do not use the GEP result to infer offset and result type #134221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2025
Merged

[Clang][CodeGen] Do not use the GEP result to infer offset and result type #134221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions clang/lib/CodeGen/CGBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,25 @@ class CGBuilderTy : public CGBuilderBaseTy {
Address createConstGEP2_32(Address Addr, unsigned Idx0, unsigned Idx1,
const llvm::Twine &Name) {
const llvm::DataLayout &DL = BB->getDataLayout();
llvm::GetElementPtrInst *GEP;
llvm::Value *V;
if (IsInBounds)
GEP = cast<llvm::GetElementPtrInst>(CreateConstInBoundsGEP2_32(
Addr.getElementType(), emitRawPointerFromAddress(Addr), Idx0, Idx1,
Name));
V = CreateConstInBoundsGEP2_32(Addr.getElementType(),
emitRawPointerFromAddress(Addr), Idx0,
Idx1, Name);
else
GEP = cast<llvm::GetElementPtrInst>(CreateConstGEP2_32(
Addr.getElementType(), emitRawPointerFromAddress(Addr), Idx0, Idx1,
Name));
V = CreateConstGEP2_32(Addr.getElementType(),
emitRawPointerFromAddress(Addr), Idx0, Idx1, Name);
llvm::APInt Offset(
DL.getIndexSizeInBits(Addr.getType()->getPointerAddressSpace()), 0,
/*isSigned=*/true);
if (!GEP->accumulateConstantOffset(DL, Offset))
llvm_unreachable("offset of GEP with constants is always computable");
return Address(GEP, GEP->getResultElementType(),
if (!llvm::GEPOperator::accumulateConstantOffset(
Addr.getElementType(), {getInt32(Idx0), getInt32(Idx1)}, DL,
Offset))
llvm_unreachable(
"accumulateConstantOffset with constant indices should not fail.");
llvm::Type *ElementTy = llvm::GetElementPtrInst::getIndexedType(
Addr.getElementType(), {Idx0, Idx1});
return Address(V, ElementTy,
Addr.getAlignment().alignmentAtOffset(
CharUnits::fromQuantity(Offset.getSExtValue())),
IsInBounds ? Addr.isKnownNonNull() : NotKnownNonNull);
Expand Down
Loading