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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-09-08 16:32:59 -07:00
parent a459ff3a77 1da7173595
commit a34e4eb804
60 changed files with 1028 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/SILOptimizer/Utils/InstOptUtils.cpp
View File

@@ -1023,16 +1023,13 @@ swift::castValueToABICompatibleType(SILBuilder *builder, SILLocation loc,
SmallVector<std::pair<EnumElementDecl *, SILBasicBlock *>, 1> caseBBs;
caseBBs.push_back(std::make_pair(someDecl, someBB));
builder->setInsertionPoint(curBB);
builder->createSwitchEnum(loc, value, noneBB, caseBBs);
auto *switchEnum = builder->createSwitchEnum(loc, value, noneBB, caseBBs);
// In OSSA switch_enum destinations have terminator results.
//
// TODO: This should be in a switchEnum utility.
SILValue unwrappedValue;
if (builder->hasOwnership()) {
// Create a terminator result, NOT a phi, despite the API name.
noneBB->createPhiArgument(value->getType(), OwnershipKind::None);
unwrappedValue =
someBB->createPhiArgument(optionalSrcTy, value.getOwnershipKind());
unwrappedValue = switchEnum->createOptionalSomeResult();
builder->setInsertionPoint(someBB);
} else {
builder->setInsertionPoint(someBB);