D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-03-17 01:21:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'merge-2.064' into merge-2.065

Browse Source
This commit is contained in:
Kai Nacke
2013-12-18 17:45:50 +01:00
parent 96798d1474 e7fdbafe2d
commit 26cbad3800
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gen/arrays.cpp
View File

@@ -1135,24 +1135,8 @@ void DtoArrayBoundsCheck(Loc& loc, DValue* arr, DValue* index, DValue* lowerBoun
assert((arrty->ty == Tsarray || arrty->ty == Tarray || arrty->ty == Tpointer) &&
"Can only array bounds check for static or dynamic arrays");
// Do not emit bounds check code if the index is statically known to be
// within bounds.
if (arrty->ty == Tsarray && isaConstantInt(index->getRVal())) {
assert(!arr->isSlice());
assert(!arr->isNull());
assert(!lowerBound);
TypeSArray *sarray = static_cast<TypeSArray*>(arrty);
llvm::ConstantInt *constIndex = static_cast<llvm::ConstantInt*>(index->getRVal());
if (sarray->dim->toUInteger() < constIndex->getZExtValue()) {
// If this happens then it is possible a frontend bug.
// Just output a warning and continue generating a runtime check.
// This could be generic code which is never executed.
warning(loc, "Static array index out of bounds (should have been detected during semantic analysis)");
}
else
return ;
}
// We do not check if the bounds check can be omitted. This is the
// responsibility of the caller and performed in IndexExp::toElem().
// runtime check

6
gen/module.cpp
View File

@@ -394,7 +394,7 @@ static void build_dso_registry_calls(llvm::Constant* thisModuleInfo)
llvm::GlobalVariable* minfoBeg = new llvm::GlobalVariable(
*gIR->module,
moduleInfoPtrTy,
true,
false, // FIXME: mRelocModel != llvm::Reloc::PIC_
llvm::GlobalValue::LinkOnceODRLinkage,
getNullPtr(moduleInfoPtrTy),
"_minfo_beg"
@@ -408,7 +408,7 @@ static void build_dso_registry_calls(llvm::Constant* thisModuleInfo)
llvm::GlobalVariable* thismref = new llvm::GlobalVariable(
*gIR->module,
moduleInfoPtrTy,
true,
false, // FIXME: mRelocModel != llvm::Reloc::PIC_
llvm::GlobalValue::LinkOnceODRLinkage,
DtoBitCast(thisModuleInfo, moduleInfoPtrTy),
thismrefname
@@ -419,7 +419,7 @@ static void build_dso_registry_calls(llvm::Constant* thisModuleInfo)
llvm::GlobalVariable* minfoEnd = new llvm::GlobalVariable(
*gIR->module,
moduleInfoPtrTy,
true,
false, // FIXME: mRelocModel != llvm::Reloc::PIC_
llvm::GlobalValue::LinkOnceODRLinkage,
getNullPtr(moduleInfoPtrTy),
"_minfo_end"

4
gen/toir.cpp
View File

@@ -1715,12 +1715,12 @@ DValue* IndexExp::toElem(IRState* p)
arrptr = DtoGEP1(l->getRVal(),r->getRVal());
}
else if (e1type->ty == Tsarray) {
if (gIR->emitArrayBoundsChecks())
if (gIR->emitArrayBoundsChecks() && !skipboundscheck)
DtoArrayBoundsCheck(loc, l, r);
arrptr = DtoGEP(l->getRVal(), zero, r->getRVal());
}
else if (e1type->ty == Tarray) {
if (gIR->emitArrayBoundsChecks())
if (gIR->emitArrayBoundsChecks() && !skipboundscheck)
DtoArrayBoundsCheck(loc, l, r);
arrptr = DtoArrayPtr(l);
arrptr = DtoGEP1(arrptr,r->getRVal());