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

Large Types IRGen Pass: Fix runtime crash for large enums

Browse Source
This commit is contained in:
Joe Shajrawi
2017-06-23 14:20:56 -07:00
parent 62c1f215ce
commit 326ba1e67f
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/IRGen/LoadableByAddress.cpp
View File

@@ -1344,6 +1344,24 @@ static void castTupleInstr(SILInstruction *instr, IRGenModule &Mod) {
castInstr->setOperand(0, instr);
}
static SILValue createCopyOfEnum(StructLoweringState &pass,
SwitchEnumInst *orig) {
auto value = orig->getOperand();
SILBuilder allocBuilder(pass.F->begin()->begin());
auto *allocInstr =
allocBuilder.createAllocStack(getLocForValue(value), value->getType());
SILBuilder copyBuilder(orig);
createOutlinedCopyCall(copyBuilder, value, allocInstr, pass);
for (TermInst *termInst : pass.returnInsts) {
SILBuilder deallocBuilder(termInst);
deallocBuilder.createDeallocStack(allocInstr->getLoc(), allocInstr);
}
return allocInstr;
}
static void rewriteFunction(StructLoweringState &pass,
LoadableStorageAllocation &allocator) {
@@ -1357,6 +1375,9 @@ static void rewriteFunction(StructLoweringState &pass,
do {
while (!pass.switchEnumInstsToMod.empty()) {
auto *instr = pass.switchEnumInstsToMod.pop_back_val();
/* unchecked_take_enum_data_addr can be destructive.
* work on a copy instead of the original enum */
auto copiedValue = createCopyOfEnum(pass, instr);
SILBuilder enumBuilder(instr);
unsigned numOfCases = instr->getNumCases();
SmallVector<std::pair<EnumElementDecl *, SILBasicBlock *>, 16> caseBBs;
@@ -1374,8 +1395,7 @@ static void rewriteFunction(StructLoweringState &pass,
}
auto *newArg = argBuilder.createUncheckedTakeEnumDataAddr(
instr->getLoc(), instr->getOperand(), decl,
newSILType.getAddressType());
instr->getLoc(), copiedValue, decl, newSILType.getAddressType());
arg->replaceAllUsesWith(newArg);
currBB->eraseArgument(0);
@@ -1401,7 +1421,7 @@ static void rewriteFunction(StructLoweringState &pass,
SILBasicBlock *defaultBB =
instr->hasDefault() ? instr->getDefaultBB() : nullptr;
auto *newInstr = enumBuilder.createSwitchEnumAddr(
instr->getLoc(), instr->getOperand(), defaultBB, caseBBs);
instr->getLoc(), copiedValue, defaultBB, caseBBs);
instr->replaceAllUsesWith(newInstr);
instr->getParent()->erase(instr);
}