Skip to content

Avoid unnecessary insertion of mark_unresolved_noncopyable_value #85052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Avoid unnecessary insertion of mark_unresolved_noncopyable_value #85052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/SILGen/SILGenFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,10 +807,15 @@ void SILGenFunction::emitCaptures(SILLocation loc,
// If we have a mutable binding for a 'let', such as 'self' in an
// 'init' method, load it.
if (val->getType().isMoveOnly()) {
val = B.createMarkUnresolvedNonCopyableValueInst(
loc, val,
MarkUnresolvedNonCopyableValueInst::CheckKind::
NoConsumeOrAssign);
auto *moveOnlyIntroducer = dyn_cast_or_null<MarkUnresolvedNonCopyableValueInst>(val);
if (!moveOnlyIntroducer || moveOnlyIntroducer->getCheckKind() !=
MarkUnresolvedNonCopyableValueInst::
CheckKind::NoConsumeOrAssign) {
val = B.createMarkUnresolvedNonCopyableValueInst(
loc, val,
MarkUnresolvedNonCopyableValueInst::CheckKind::
NoConsumeOrAssign);
}
}
val = emitLoad(loc, val, tl, SGFContext(), IsNotTake).forward(*this);
}
Expand Down
21 changes: 21 additions & 0 deletions test/SILGen/addressable_read.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature AddressableParameters %s

public struct Container<Element: ~Copyable >: ~Copyable {
var _storage: UnsafeMutableBufferPointer<Element>
var _count: Int

public subscript(index: Int) -> Element {
@_addressableSelf
_read {
precondition(index >= 0 && index < _count, "Index out of bounds")
yield _storage.baseAddress.unsafelyUnwrapped.advanced(by: index).pointee
}
_modify {
precondition(index >= 0 && index < _count, "Index out of bounds")
yield &_storage.baseAddress.unsafelyUnwrapped.advanced(by: index).pointee
}
}
}

extension Container: Copyable where Element: Copyable {}