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 pull request #35254 from meg-gupta/csefix1

Browse Source 
[NFC] Simplify DenseMapInfo<SimpleValue>::isEqual in CSE
This commit is contained in:
Michael Gottesman
2021-01-04 16:39:40 -08:00
committed by GitHub
parent 126f1ac6fb badf0c1c07
commit 3361affe3d
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/SILOptimizer/Transforms/CSE.cpp
View File

@@ -510,20 +510,7 @@ bool llvm::DenseMapInfo<SimpleValue>::isEqual(SimpleValue LHS,
return true;
return false;
};
auto canHandleOwnershipConversion = [](const SILInstruction *lhs,
const SILInstruction *rhs) -> bool {
if (!lhs->getFunction()->hasOwnership())
return true;
// TODO: Support MultipleValueInstructionResult in OSSA RAUW utility and
// extend it here as well
if (!isa<SingleValueInstruction>(lhs))
return false;
return OwnershipFixupContext::canFixUpOwnershipForRAUW(
cast<SingleValueInstruction>(lhs), cast<SingleValueInstruction>(rhs));
};
return LHSI->getKind() == RHSI->getKind() &&
LHSI->isIdenticalTo(RHSI, opCmp) &&
(LHSI == RHSI || canHandleOwnershipConversion(LHSI, RHSI));
return LHSI->getKind() == RHSI->getKind() && LHSI->isIdenticalTo(RHSI, opCmp);
}
namespace {
@@ -1032,9 +1019,15 @@ bool CSE::processNode(DominanceInfoNode *Node) {
++NumCSE;
continue;
}
// Replace SingleValueInstruction using OSSA RAUW here
// TODO: Support MultipleValueInstructionResult in OSSA RAUW utility and
// extend it here as well
if (!isa<SingleValueInstruction>(Inst))
continue;
if (!OwnershipFixupContext::canFixUpOwnershipForRAUW(
cast<SingleValueInstruction>(Inst),
cast<SingleValueInstruction>(AvailInst)))
continue;
// Replace SingleValueInstruction using OSSA RAUW here
nextI = FixupCtx.replaceAllUsesAndEraseFixingOwnership(
cast<SingleValueInstruction>(Inst),
cast<SingleValueInstruction>(AvailInst));