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

Use 'hasAssociatedValues'

Browse Source 
Use 'hasAssociatedValues' instead of computing and discarding the
interface type of an enum element decl.  This change has specifically not
been made in conditions that use the presence or absence of the
interface type, only conditions that depend on the presence or absence
of associated values in the enum element decl.
This commit is contained in:
Robert Widmann
2017-05-22 09:32:44 -07:00
parent e92805f98d
commit 3b202c18d8
20 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ namespace {
static void createRefCountOpForPayload(SILBuilder &Builder, SILInstruction *I,
EnumElementDecl *EnumDecl,
SILValue DefOfEnum = SILValue()) {
assert(EnumDecl->getArgumentInterfaceType() &&
assert(EnumDecl->hasAssociatedValues() &&
"We assume enumdecl has an argument type");
SILModule &Mod = I->getModule();
@@ -755,7 +755,7 @@ static bool tryToSinkRefCountAcrossSwitch(SwitchEnumInst *Switch,
EnumElementDecl *Enum = Case.first;
SILBasicBlock *Succ = Case.second;
Builder.setInsertionPoint(&*Succ->begin());
if (Enum->getArgumentInterfaceType())
if (Enum->hasAssociatedValues())
createRefCountOpForPayload(Builder, &*RV, Enum, Switch->getOperand());
}
@@ -841,7 +841,7 @@ static bool tryToSinkRefCountAcrossSelectEnum(CondBranchInst *CondBr,
EnumElementDecl *Enum = Elts[i];
SILBasicBlock *Succ = i == 0 ? CondBr->getTrueBB() : CondBr->getFalseBB();
Builder.setInsertionPoint(&*Succ->begin());
if (Enum->getArgumentInterfaceType())
if (Enum->hasAssociatedValues())
createRefCountOpForPayload(Builder, &*I, Enum, SEI->getEnumOperand());
}
@@ -1304,7 +1304,7 @@ bool BBEnumTagDataflowState::visitRetainValueInst(RetainValueInst *RVI) {
return false;
// If we do not have any argument, kill the retain_value.
if (!(*FindResult)->second->getArgumentInterfaceType()) {
if (!(*FindResult)->second->hasAssociatedValues()) {
RVI->eraseFromParent();
return true;
}
@@ -1324,7 +1324,7 @@ bool BBEnumTagDataflowState::visitReleaseValueInst(ReleaseValueInst *RVI) {
return false;
// If we do not have any argument, just delete the release value.
if (!(*FindResult)->second->getArgumentInterfaceType()) {
if (!(*FindResult)->second->hasAssociatedValues()) {
RVI->eraseFromParent();
return true;
}
@@ -1415,7 +1415,7 @@ BBEnumTagDataflowState::hoistDecrementsIntoSwitchRegions(AliasAnalysis *AA) {
for (auto P : EnumBBCaseList) {
// If we don't have an argument for this case, there is nothing to
// do... continue...
if (!P.second->getArgumentInterfaceType())
if (!P.second->hasAssociatedValues())
continue;
// Otherwise create the release_value before the terminator of the
@@ -1480,7 +1480,7 @@ findRetainsSinkableFromSwitchRegionForEnum(
// If the case does not have an argument type, skip the predecessor since
// there will not be a retain to sink.
if (!Decl->getArgumentInterfaceType())
if (!Decl->hasAssociatedValues())
continue;
// Ok, we found a payloaded predecessor. Look backwards through the