Skip to content

Commit b5b637c

Browse files
committed
[NFC] SIL: Renamed helper.
removing...To -> removing...From
1 parent 73b0ad3 commit b5b637c

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

include/swift/SIL/SILInstruction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9160,7 +9160,7 @@ class MoveOnlyWrapperToCopyableBoxInst
91609160
ValueOwnershipKind forwardingOwnershipKind)
91619161
: UnaryInstructionBase(
91629162
DebugLoc, operand,
9163-
operand->getType().removingMoveOnlyWrapperToBoxedType(
9163+
operand->getType().removingMoveOnlyWrapperFromBoxedType(
91649164
operand->getFunction()),
91659165
forwardingOwnershipKind) {
91669166
assert(

include/swift/SIL/SILType.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ class SILType {
868868
///
869869
/// DISCUSSION: This is separate from removingMoveOnlyWrapper since this API
870870
/// requires a SILFunction * and is specialized.
871-
SILType removingMoveOnlyWrapperToBoxedType(const SILFunction *fn);
871+
SILType removingMoveOnlyWrapperFromBoxedType(const SILFunction *fn);
872872

873873
/// Returns a SILType with any archetypes mapped out of context.
874874
SILType mapTypeOutOfContext() const;

include/swift/SIL/SILValue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ class ValueBase : public SILNode, public SILAllocated<ValueBase> {
605605
Type = Type.removingMoveOnlyWrapper();
606606
} else {
607607
assert(Type.isBoxedMoveOnlyWrappedType(fn));
608-
Type = Type.removingMoveOnlyWrapperToBoxedType(fn);
608+
Type = Type.removingMoveOnlyWrapperFromBoxedType(fn);
609609
}
610610
return true;
611611
}

lib/SIL/IR/SILType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ SILType SILType::addingMoveOnlyWrapperToBoxedType(const SILFunction *fn) {
12661266
return SILType::getPrimitiveObjectType(newBoxType);
12671267
}
12681268

1269-
SILType SILType::removingMoveOnlyWrapperToBoxedType(const SILFunction *fn) {
1269+
SILType SILType::removingMoveOnlyWrapperFromBoxedType(const SILFunction *fn) {
12701270
auto boxTy = castTo<SILBoxType>();
12711271
auto *oldLayout = boxTy->getLayout();
12721272
auto oldField = oldLayout->getFields()[0];

lib/SIL/Verifier/SILVerifier.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6548,9 +6548,11 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
65486548
"Operand value should be an object");
65496549
require(cvt->getOperand()->getType().isBoxedMoveOnlyWrappedType(cvt->getFunction()),
65506550
"Operand should be move only wrapped");
6551-
require(cvt->getType() ==
6552-
cvt->getOperand()->getType().removingMoveOnlyWrapperToBoxedType(cvt->getFunction()),
6553-
"Result and operand must have the same type, today.");
6551+
require(
6552+
cvt->getType() ==
6553+
cvt->getOperand()->getType().removingMoveOnlyWrapperFromBoxedType(
6554+
cvt->getFunction()),
6555+
"Result and operand must have the same type, today.");
65546556
}
65556557

65566558
void checkCopyableToMoveOnlyWrapperValueInst(

0 commit comments

Comments
 (0)