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

Fix for issue #553.

Browse Source 
This version uses the skipboundscheck member variable.
This commit is contained in:
Kai Nacke
2013-12-16 17:32:01 +01:00
parent 2188ef9e56
commit dd3cc5f682
2 changed files with 4 additions and 20 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

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());