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

[bug fix] avoid generating explicit_copy_* for copyable types

Browse Source 
The move checker was converting some kinds of copies
into their `explicit_copy_*` versions, despite the
type of the copy being a copyable type. This was
causing random crashes in some narrow circumstances.

resolves rdar://106669967
This commit is contained in:
Kavon Farvardin
2023-03-13 19:42:16 -07:00
parent ea1e83b1d7
commit d4992be0d3
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/SILOptimizer/Mandatory/MoveOnlyUtils.cpp
View File

@@ -116,9 +116,12 @@ bool swift::siloptimizer::cleanupNonCopyableCopiesAfterEmittingDiagnostic(
auto *inst = &*ii;
++ii;
// Convert load [copy] -> load_borrow + explicit_copy_value.
// Convert load [copy] *MoveOnly -> load_borrow + explicit_copy_value.
if (auto *li = dyn_cast<LoadInst>(inst)) {
if (li->getOwnershipQualifier() == LoadOwnershipQualifier::Copy) {
if (!li->getType().isMoveOnly())
continue;
SILBuilderWithScope builder(li);
auto *lbi = builder.createLoadBorrow(li->getLoc(), li->getOperand());
auto *cvi = builder.createExplicitCopyValue(li->getLoc(), lbi);
@@ -129,10 +132,13 @@ bool swift::siloptimizer::cleanupNonCopyableCopiesAfterEmittingDiagnostic(
}
}
// Convert copy_addr !take of src to its explicit value form so we don't
// error.
// Convert copy_addr !take MoveOnly ... -> explicit_copy_addr ...same...
// so we don't error.
if (auto *copyAddr = dyn_cast<CopyAddrInst>(inst)) {
if (!copyAddr->isTakeOfSrc()) {
if (!copyAddr->getSrc()->getType().isMoveOnly())
continue;
SILBuilderWithScope builder(copyAddr);
builder.createExplicitCopyAddr(
copyAddr->getLoc(), copyAddr->getSrc(), copyAddr->getDest(),
@@ -143,10 +149,11 @@ bool swift::siloptimizer::cleanupNonCopyableCopiesAfterEmittingDiagnostic(
}
}
// Convert any copy_value of move_only type to explicit copy value.
// Convert any copy_value of MoveOnly type -> explicit_copy_value.
if (auto *cvi = dyn_cast<CopyValueInst>(inst)) {
if (!cvi->getOperand()->getType().isMoveOnly())
continue;
SILBuilderWithScope b(cvi);
auto *expCopy =
b.createExplicitCopyValue(cvi->getLoc(), cvi->getOperand());