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
2022-06-15 21:34:18 -07:00
parent da9dd07371 d0b2f41f00
commit 7e7803a999
9 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/SIL/AbstractionPattern.h
View File

@@ -1257,11 +1257,11 @@ public:
/// Given that the value being abstracted is a move only type, return the
/// abstraction pattern with the move only bit removed.
AbstractionPattern withoutMoveOnly() const;
AbstractionPattern removingMoveOnlyWrapper() const;
/// Given that the value being abstracted is not a move only type, return the
/// abstraction pattern with the move only bit added.
AbstractionPattern withMoveOnly() const;
AbstractionPattern addingMoveOnlyWrapper() const;
/// Given that the value being abstracted is a tuple type, return
/// the abstraction pattern for its object type.

6
include/swift/SIL/SILBuilder.h
View File

@@ -1299,14 +1299,16 @@ public:
MoveOnlyWrapperToCopyableValueInst *
createOwnedMoveOnlyWrapperToCopyableValue(SILLocation loc, SILValue src) {
return insert(new (getModule()) MoveOnlyWrapperToCopyableValueInst(
*F, getSILDebugLocation(loc), src, OwnershipKind::Owned));
*F, getSILDebugLocation(loc), src,
MoveOnlyWrapperToCopyableValueInst::Owned));
}
MoveOnlyWrapperToCopyableValueInst *
createGuaranteedMoveOnlyWrapperToCopyableValue(SILLocation loc,
SILValue src) {
return insert(new (getModule()) MoveOnlyWrapperToCopyableValueInst(
*F, getSILDebugLocation(loc), src, OwnershipKind::Guaranteed));
*F, getSILDebugLocation(loc), src,
MoveOnlyWrapperToCopyableValueInst::Guaranteed));
}
UnconditionalCheckedCastInst *

31
include/swift/SIL/SILInstruction.h
View File

@@ -7627,19 +7627,29 @@ class CopyableToMoveOnlyWrapperValueInst
class MoveOnlyWrapperToCopyableValueInst
: public UnaryInstructionBase<
SILInstructionKind::MoveOnlyWrapperToCopyableValueInst,
SingleValueInstruction>,
public OwnershipForwardingMixin {
FirstArgOwnershipForwardingSingleValueInst> {
public:
enum InitialKind {
Guaranteed,
Owned,
};
private:
friend class SILBuilder;
InitialKind initialKind;
MoveOnlyWrapperToCopyableValueInst(const SILFunction &fn,
SILDebugLocation DebugLoc,
SILValue operand,
OwnershipKind forwardingOwnershipKind)
: UnaryInstructionBase(DebugLoc, operand,
operand->getType().removingMoveOnlyWrapper()),
OwnershipForwardingMixin(
SILInstructionKind::MoveOnlyWrapperToCopyableValueInst,
forwardingOwnershipKind) {}
SILValue operand, InitialKind kind)
: UnaryInstructionBase(
DebugLoc, operand, operand->getType().removingMoveOnlyWrapper(),
kind == InitialKind::Guaranteed ? OwnershipKind::Guaranteed
: OwnershipKind::Owned),
initialKind(kind) {}
public:
InitialKind getInitialKind() const { return initialKind; }
};
/// Given an object reference, return true iff it is non-nil and refers
@@ -9783,8 +9793,7 @@ inline bool OwnershipForwardingMixin::isa(SILInstructionKind kind) {
OwnershipForwardingConversionInst::classof(kind) ||
OwnershipForwardingSelectEnumInstBase::classof(kind) ||
OwnershipForwardingMultipleValueInstruction::classof(kind) ||
kind == SILInstructionKind::MarkMustCheckInst ||
kind == SILInstructionKind::MoveOnlyWrapperToCopyableValueInst;
kind == SILInstructionKind::MarkMustCheckInst;
}
inline OwnershipForwardingMixin *

2
include/swift/SIL/TypeLowering.h
View File

@@ -296,7 +296,7 @@ public:
IsInfiniteType_t isInfinite() const {
return IsInfiniteType_t((Flags & InfiniteFlag) != 0);
}
IsMoveOnly_t isMoveOnly() const {
IsMoveOnly_t isMoveOnlyWrapped() const {
return IsMoveOnly_t((Flags & MoveOnlyFlag) != 0);
}