Skip to content

Commit 8216a2a

Browse files
committed
[move-only] Rename AbstractionPattern move only wrapper add/remove methods to match SILType's
Just forgot to change these when I changed the name of the SILType methods. In summary: 1. withoutMoveOnly -> removingMoveOnlyWrapper 2. withMoveOnly -> addingMoveOnlyWrapper
1 parent 6cdfc29 commit 8216a2a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/swift/SIL/AbstractionPattern.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,11 +1257,11 @@ class AbstractionPattern {
12571257

12581258
/// Given that the value being abstracted is a move only type, return the
12591259
/// abstraction pattern with the move only bit removed.
1260-
AbstractionPattern withoutMoveOnly() const;
1260+
AbstractionPattern removingMoveOnlyWrapper() const;
12611261

12621262
/// Given that the value being abstracted is not a move only type, return the
12631263
/// abstraction pattern with the move only bit added.
1264-
AbstractionPattern withMoveOnly() const;
1264+
AbstractionPattern addingMoveOnlyWrapper() const;
12651265

12661266
/// Given that the value being abstracted is a tuple type, return
12671267
/// the abstraction pattern for its object type.

lib/SIL/IR/AbstractionPattern.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ AbstractionPattern::getTupleElementType(unsigned index) const {
401401
llvm_unreachable("bad kind");
402402
}
403403

404-
AbstractionPattern AbstractionPattern::withoutMoveOnly() const {
404+
AbstractionPattern AbstractionPattern::removingMoveOnlyWrapper() const {
405405
switch (getKind()) {
406406
case Kind::Invalid:
407407
llvm_unreachable("querying invalid abstraction pattern!");
@@ -435,7 +435,7 @@ AbstractionPattern AbstractionPattern::withoutMoveOnly() const {
435435
llvm_unreachable("bad kind");
436436
}
437437

438-
AbstractionPattern AbstractionPattern::withMoveOnly() const {
438+
AbstractionPattern AbstractionPattern::addingMoveOnlyWrapper() const {
439439
switch (getKind()) {
440440
case Kind::Invalid:
441441
llvm_unreachable("querying invalid abstraction pattern!");

lib/SIL/IR/TypeLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ namespace {
697697
RetTy visitSILMoveOnlyType(CanSILMoveOnlyType type,
698698
AbstractionPattern origType,
699699
IsTypeExpansionSensitive_t isSensitive) {
700-
AbstractionPattern innerAbstraction = origType.withoutMoveOnly();
700+
AbstractionPattern innerAbstraction = origType.removingMoveOnlyWrapper();
701701
CanType innerType = type->getInnerType();
702702
auto &lowering =
703703
TC.getTypeLowering(innerAbstraction, innerType, Expansion);

0 commit comments

Comments
 (0)