Skip to content

ModuleUtils: Use proper address space defaults in a few places. #119136

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

Closed
wants to merge 1 commit into from
Closed

ModuleUtils: Use proper address space defaults in a few places. #119136

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
17 changes: 11 additions & 6 deletions llvm/lib/Transforms/Utils/ModuleUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ static void appendToGlobalArray(StringRef ArrayName, Module &M, Function *F,
IRBuilder<> IRB(M.getContext());
FunctionType *FnTy = FunctionType::get(IRB.getVoidTy(), false);

unsigned CtorPtrAS = M.getDataLayout().getProgramAddressSpace();
unsigned GlobalsAS = M.getDataLayout().getDefaultGlobalsAddressSpace();
llvm::Type *CtorPFTy = llvm::PointerType::get(FnTy, CtorPtrAS);
llvm::Type *ArgTy = IRB.getPtrTy(GlobalsAS);

// Get the current set of static global constructors and add the new ctor
// to the list.
SmallVector<Constant *, 16> CurrentCtors;
Expand All @@ -45,17 +50,16 @@ static void appendToGlobalArray(StringRef ArrayName, Module &M, Function *F,
}
GVCtor->eraseFromParent();
} else {
EltTy = StructType::get(IRB.getInt32Ty(),
PointerType::get(FnTy, F->getAddressSpace()),
IRB.getPtrTy());
EltTy = StructType::get(
IRB.getInt32Ty(), PointerType::get(FnTy, F->getAddressSpace()), ArgTy);
}

// Build a 3 field global_ctor entry. We don't take a comdat key.
Constant *CSVals[3];
CSVals[0] = IRB.getInt32(Priority);
CSVals[1] = F;
CSVals[2] = Data ? ConstantExpr::getPointerCast(Data, IRB.getPtrTy())
: Constant::getNullValue(IRB.getPtrTy());
CSVals[2] = Data ? ConstantExpr::getPointerCast(Data, ArgTy)
: Constant::getNullValue(ArgTy);
Constant *RuntimeCtorInit =
ConstantStruct::get(EltTy, ArrayRef(CSVals, EltTy->getNumElements()));

Expand Down Expand Up @@ -483,7 +487,8 @@ bool llvm::lowerGlobalIFuncUsersAsGlobalCtor(

InitBuilder.CreateRetVoid();

PointerType *ConstantDataTy = PointerType::get(Ctx, 0);
PointerType *ConstantDataTy =
PointerType::get(Ctx, DL.getDefaultGlobalsAddressSpace());

// TODO: Is this the right priority? Probably should be before any other
// constructors?
Expand Down
Loading