mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-02 08:01:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'llvm3.0' into merge-3.0

Browse source 
Conflicts:
	gen/configfile.cpp
This commit is contained in:
David Nadlinger 2011-12-04 18:16:36 +01:00
commit fe19ee84f5
15 changed files with 73 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gen/arrays.cpp
View file

@ -455,7 +455,7 @@ LLConstant* DtoConstArrayInitializer(ArrayInitializer* arrinit)
LLConstant* idxs[2] = { DtoConstUint(0), DtoConstUint(0) };
LLConstant* gep = llvm::ConstantExpr::getGetElementPtr(gvar,idxs,2);
LLConstant* gep = llvm::ConstantExpr::getGetElementPtr(gvar, idxs, true);
gep = llvm::ConstantExpr::getBitCast(gvar, getPtrToType(llelemty));
return DtoConstSlice(DtoConstSize_t(arrlen), gep, arrty);