CUDA: give correct address space to globals declared in functions

llvm-svn: 162787
This commit is contained in:
Peter Collingbourne 2012-08-28 20:37:10 +00:00
parent 7ae6360758
commit ee0502d551
2 changed files with 7 additions and 1 deletions

View File

@ -184,12 +184,14 @@ CodeGenFunction::CreateStaticVarDecl(const VarDecl &D,
Name = GetStaticDeclName(*this, D, Separator);
llvm::Type *LTy = CGM.getTypes().ConvertTypeForMem(Ty);
unsigned AddrSpace =
CGM.GetGlobalVarAddressSpace(&D, CGM.getContext().getTargetAddressSpace(Ty));
llvm::GlobalVariable *GV =
new llvm::GlobalVariable(CGM.getModule(), LTy,
Ty.isConstant(getContext()), Linkage,
CGM.EmitNullConstant(D.getType()), Name, 0,
llvm::GlobalVariable::NotThreadLocal,
CGM.getContext().getTargetAddressSpace(Ty));
AddrSpace);
GV->setAlignment(getContext().getDeclAlign(&D).getQuantity());
if (Linkage != llvm::GlobalValue::InternalLinkage)
GV->setVisibility(CurFn->getVisibility());

View File

@ -20,5 +20,9 @@ __device__ void foo() {
// CHECK: load i32* bitcast (i32 addrspace(3)* @k to i32*)
k++;
static int li;
// CHECK: load i32 addrspace(1)* @_ZZ3foovE2li
li++;
}