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

Merge branch 'master' into merge-2.067

Browse source 
Conflicts:
	gen/dibuilder.cpp
	gen/dibuilder.h
This commit is contained in:
Kai Nacke 2015-05-01 11:28:47 +02:00
commit f029c9b9af
8 changed files with 188 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gen/module.cpp
View file

@ -595,7 +595,7 @@ static void addCoverageAnalysis(Module* m)
d_cover_valid_slice = DtoConstSlice( DtoConstSize_t(type->getArrayNumElements()),
llvm::ConstantExpr::getGetElementPtr(
#if LDC_LLVM_VER >= 307
DtoSize_t(),
type,
#endif
m->d_cover_valid, idxs, true) );
@ -616,7 +616,7 @@ static void addCoverageAnalysis(Module* m)
d_cover_data_slice = DtoConstSlice( DtoConstSize_t(type->getArrayNumElements()),
llvm::ConstantExpr::getGetElementPtr(
#if LDC_LLVM_VER >= 307
LLType::getInt32Ty(gIR->context()),
type,
#endif
m->d_cover_data, idxs, true) );
}