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

Update Devirtualizer's analysis invalidation (#31284)

Browse Source 
* Update Devirtualizer's analysis invalidation

castValueToABICompatibleType can change CFG, Devirtualizer uses this api but doesn't check if it modified the cfg
This commit is contained in:
Meghana Gupta
2020-04-27 18:30:33 -07:00
committed by GitHub
parent 041dfb9354
commit 013387eceb
5 changed files with 89 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SILOptimizer/Transforms/SimplifyCFG.cpp
View File

@@ -2418,9 +2418,9 @@ bool SimplifyCFG::simplifyTryApplyBlock(TryApplyInst *TAI) {
for (unsigned i = 0; i < numArgs; ++i) {
auto Arg = TAI->getArgument(i);
// Cast argument if required.
Arg = castValueToABICompatibleType(&Builder, TAI->getLoc(), Arg,
origConv.getSILArgumentType(i),
targetConv.getSILArgumentType(i));
std::tie(Arg, std::ignore) = castValueToABICompatibleType(
&Builder, TAI->getLoc(), Arg, origConv.getSILArgumentType(i),
targetConv.getSILArgumentType(i));
Args.push_back(Arg);
}
@@ -2435,8 +2435,9 @@ bool SimplifyCFG::simplifyTryApplyBlock(TryApplyInst *TAI) {
auto Loc = TAI->getLoc();
auto *NormalBB = TAI->getNormalBB();
auto CastedResult = castValueToABICompatibleType(&Builder, Loc, NewAI,
ResultTy, OrigResultTy);
SILValue CastedResult;
std::tie(CastedResult, std::ignore) = castValueToABICompatibleType(
&Builder, Loc, NewAI, ResultTy, OrigResultTy);
Builder.createBranch(Loc, NormalBB, { CastedResult });
TAI->eraseFromParent();