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

SILOptimizer: Pipe through TypeExpansionContext

Browse Source
This commit is contained in:
Arnold Schwaighofer
2019-11-04 12:02:21 -08:00
parent 33f4f57cc4
commit 8aaa7b4dc1
43 changed files with 817 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/SILOptimizer/Transforms/AllocBoxToStack.cpp
View File

@@ -436,7 +436,8 @@ static bool rewriteAllocBoxAsAllocStack(AllocBoxInst *ABI) {
&& "rewriting multi-field box not implemented");
auto *ASI = Builder.createAllocStack(
ABI->getLoc(),
getSILBoxFieldType(ABI->getBoxType(), ABI->getModule().Types, 0),
getSILBoxFieldType(TypeExpansionContext(*ABI->getFunction()),
ABI->getBoxType(), ABI->getModule().Types, 0),
ABI->getVarInfo(), ABI->hasDynamicLifetime());
// Transfer a mark_uninitialized if we have one.
@@ -452,9 +453,9 @@ static bool rewriteAllocBoxAsAllocStack(AllocBoxInst *ABI) {
assert(ABI->getBoxType()->getLayout()->getFields().size() == 1
&& "promoting multi-field box not implemented");
auto &Lowering = ABI->getFunction()
->getTypeLowering(
getSILBoxFieldType(ABI->getBoxType(), ABI->getModule().Types, 0));
auto &Lowering = ABI->getFunction()->getTypeLowering(
getSILBoxFieldType(TypeExpansionContext(*ABI->getFunction()),
ABI->getBoxType(), ABI->getModule().Types, 0));
auto Loc = CleanupLocation::get(ABI->getLoc());
for (auto LastRelease : FinalReleases) {
@@ -585,7 +586,7 @@ SILFunction *PromotedParamCloner::initCloned(SILOptFunctionBuilder &FuncBuilder,
auto &TC = Orig->getModule().Types;
Lowering::GenericContextScope scope(TC,
OrigFTI->getSubstGenericSignature());
paramTy = getSILBoxFieldType(boxTy, TC, 0);
paramTy = getSILBoxFieldType(TypeExpansionContext(*Orig), boxTy, TC, 0);
}
auto promotedParam = SILParameterInfo(paramTy.getASTType(),
ParameterConvention::Indirect_InoutAliasable);
@@ -650,7 +651,8 @@ PromotedParamCloner::populateCloned() {
auto boxTy = (*I)->getType().castTo<SILBoxType>();
assert(boxTy->getLayout()->getFields().size() == 1
&& "promoting multi-field boxes not implemented yet");
auto promotedTy = getSILBoxFieldType(boxTy, Cloned->getModule().Types, 0);
auto promotedTy = getSILBoxFieldType(TypeExpansionContext(*Cloned), boxTy,
Cloned->getModule().Types, 0);
auto *promotedArg =
ClonedEntryBB->createFunctionArgument(promotedTy, (*I)->getDecl());
OrigPromotedParameters.insert(*I);