averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SIL: Avoid dereferencing sentinel nodes in ilist_iterators

Browse Source 
The behaviour of ilist has changed in LLVM.  It is no longer permissible to
dereference the `end()` value.  Add a check to ensure that we do not
accidentally dereference the iterator.
This commit is contained in:
Francis Ricci
2016-10-05 17:10:41 -07:00
committed by Saleem Abdulrasool
parent 7d1da2af3d
commit 66dcad0d34
8 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/SILGen/SILGenFunction.cpp
View File

@@ -34,12 +34,9 @@ using namespace Lowering;
//===----------------------------------------------------------------------===//
SILGenFunction::SILGenFunction(SILGenModule &SGM, SILFunction &F)
: SGM(SGM), F(F),
B(*this, createBasicBlock()),
OpenedArchetypesTracker(F),
CurrentSILLoc(F.getLocation()),
Cleanups(*this)
{
: SGM(SGM), F(F), StartOfPostmatter(F.end()), B(*this, createBasicBlock()),
OpenedArchetypesTracker(F), CurrentSILLoc(F.getLocation()),
Cleanups(*this) {
B.setCurrentDebugScope(F.getDebugScope());
B.setOpenedArchetypesTracker(&OpenedArchetypesTracker);
}
@@ -875,8 +872,8 @@ SILGenBuilder::SILGenBuilder(SILGenFunction &gen, SILBasicBlock *insertBB,
SmallVectorImpl<SILInstruction *> *insertedInsts)
: SILBuilder(insertBB, insertedInsts), SGM(gen.SGM) {}
SILGenBuilder::SILGenBuilder(SILGenFunction &gen, SILBasicBlock *insertBB,
SILInstruction *insertInst)
: SILBuilder(insertBB, insertInst->getIterator()), SGM(gen.SGM) {}
SILBasicBlock::iterator insertInst)
: SILBuilder(insertBB, insertInst), SGM(gen.SGM) {}
MetatypeInst *SILGenBuilder::createMetatype(SILLocation loc, SILType metatype) {
auto theMetatype = metatype.castTo<MetatypeType>();