Skip to content

Commit 198b974

Browse files
gottesmmgottesmm
authored
Merge pull request #59859 from gottesmm/pr-276c4e4220a25490659a285e8b94a36bd28ffede
[no-implicit-copy] Rename SILMoveOnlyType -> SILMoveOnlyWrappedType.
2 parents afd65fa + 8f3fe63 commit 198b974

27 files changed

+84
-75
lines changed

‎include/swift/AST/TypeDifferenceVisitor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ class CanTypeDifferenceVisitor : public CanTypePairVisitor<Impl, bool> {
333333
return asImpl().visit(type1->getCaptureType(), type2->getCaptureType());
334334
}
335335

336-
bool visitSILMoveOnlyType(CanSILMoveOnlyType type1,
337-
CanSILMoveOnlyType type2) {
336+
bool visitSILMoveOnlyWrappedType(CanSILMoveOnlyWrappedType type1,
337+
CanSILMoveOnlyWrappedType type2) {
338338
return asImpl().visit(type1->getInnerType(), type2->getInnerType());
339339
}
340340

‎include/swift/AST/TypeMatcher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ class TypeMatcher {
352352
TRIVIAL_CASE(SILFunctionType)
353353
TRIVIAL_CASE(SILBlockStorageType)
354354
TRIVIAL_CASE(SILBoxType)
355-
TRIVIAL_CASE(SILMoveOnlyType)
355+
TRIVIAL_CASE(SILMoveOnlyWrappedType)
356356

357357
bool visitProtocolCompositionType(CanProtocolCompositionType firstProtocolComposition,
358358
Type secondType,

‎include/swift/AST/TypeNodes.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ ABSTRACT_TYPE(AnyFunction, Type)
159159
ARTIFICIAL_TYPE(SILFunction, Type)
160160
ARTIFICIAL_TYPE(SILBlockStorage, Type)
161161
ARTIFICIAL_TYPE(SILBox, Type)
162-
ARTIFICIAL_TYPE(SILMoveOnly, Type)
162+
ARTIFICIAL_TYPE(SILMoveOnlyWrapped, Type)
163163
ARTIFICIAL_TYPE(SILToken, Type)
164164
TYPE(ProtocolComposition, Type)
165165
TYPE(ParameterizedProtocol, Type)

‎include/swift/AST/Types.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5002,19 +5002,20 @@ class SILBoxType final : public TypeBase, public llvm::FoldingSetNode
50025002
};
50035003
DEFINE_EMPTY_CAN_TYPE_WRAPPER(SILBoxType, Type)
50045004

5005-
class SILMoveOnlyType;
5005+
class SILMoveOnlyWrappedType;
50065006
class SILModule; // From SIL
5007-
typedef CanTypeWrapper<SILMoveOnlyType> CanMoveOnlyType;
5007+
typedef CanTypeWrapper<SILMoveOnlyWrappedType> CanMoveOnlyType;
50085008

50095009
/// A wrapper type that marks an inner type as being a move only value. Can not
50105010
/// be written directly at the Swift level, instead it is triggered by adding
50115011
/// the type attribute @_moveOnly to a different type. We transform these in
50125012
/// TypeLowering into a moveOnly SILType on the inner type.
5013-
class SILMoveOnlyType final : public TypeBase, public llvm::FoldingSetNode {
5013+
class SILMoveOnlyWrappedType final : public TypeBase,
5014+
public llvm::FoldingSetNode {
50145015
CanType innerType;
50155016

5016-
SILMoveOnlyType(CanType innerType)
5017-
: TypeBase(TypeKind::SILMoveOnly, &innerType->getASTContext(),
5017+
SILMoveOnlyWrappedType(CanType innerType)
5018+
: TypeBase(TypeKind::SILMoveOnlyWrapped, &innerType->getASTContext(),
50185019
innerType->getRecursiveProperties()),
50195020
innerType(innerType) {}
50205021

@@ -5024,10 +5025,10 @@ class SILMoveOnlyType final : public TypeBase, public llvm::FoldingSetNode {
50245025
static CanMoveOnlyType get(CanType innerType);
50255026

50265027
static bool classof(const TypeBase *T) {
5027-
return T->getKind() == TypeKind::SILMoveOnly;
5028+
return T->getKind() == TypeKind::SILMoveOnlyWrapped;
50285029
}
50295030
};
5030-
DEFINE_EMPTY_CAN_TYPE_WRAPPER(SILMoveOnlyType, Type)
5031+
DEFINE_EMPTY_CAN_TYPE_WRAPPER(SILMoveOnlyWrappedType, Type)
50315032

50325033
class SILBlockStorageType;
50335034
typedef CanTypeWrapper<SILBlockStorageType> CanSILBlockStorageType;

‎include/swift/SIL/SILType.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,15 +607,15 @@ class SILType {
607607
/// Canonical way to check if a SILType is move only. Using is/getAs/castTo
608608
/// will look through moveonly-ness.
609609
bool isMoveOnlyWrapped() const {
610-
return getRawASTType()->is<SILMoveOnlyType>();
610+
return getRawASTType()->is<SILMoveOnlyWrappedType>();
611611
}
612612

613613
/// If this is already a move only wrapped type, return *this. Otherwise, wrap
614614
/// the copyable type in the mov eonly wrapper.
615615
SILType addingMoveOnlyWrapper() const {
616616
if (isMoveOnlyWrapped())
617617
return *this;
618-
auto newType = SILMoveOnlyType::get(getRawASTType());
618+
auto newType = SILMoveOnlyWrappedType::get(getRawASTType());
619619
return SILType::getPrimitiveType(newType, getCategory());
620620
}
621621

@@ -624,7 +624,7 @@ class SILType {
624624
SILType removingMoveOnlyWrapper() const {
625625
if (!isMoveOnlyWrapped())
626626
return *this;
627-
auto moveOnly = getRawASTType()->castTo<SILMoveOnlyType>();
627+
auto moveOnly = getRawASTType()->castTo<SILMoveOnlyWrappedType>();
628628
return SILType::getPrimitiveType(moveOnly->getInnerType(), getCategory());
629629
}
630630

‎include/swift/SIL/SILValue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ class ValueBase : public SILNode, public SILAllocated<ValueBase> {
563563
/// otherwise.
564564
///
565565
/// NOTE: Please do not use this directly! It is only meant to be used by the
566-
/// optimizer pass: SILMoveOnlyTypeEliminator.
566+
/// optimizer pass: SILMoveOnlyWrappedTypeEliminator.
567567
bool unsafelyEliminateMoveOnlyWrapper() {
568568
if (!Type.isMoveOnlyWrapped())
569569
return false;

‎lib/AST/ASTContext.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ struct ASTContext::Implementation {
462462
llvm::FoldingSet<GenericFunctionType> GenericFunctionTypes;
463463
llvm::FoldingSet<SILFunctionType> SILFunctionTypes;
464464
llvm::DenseMap<CanType, SILBlockStorageType *> SILBlockStorageTypes;
465-
llvm::DenseMap<CanType, SILMoveOnlyType *> SILMoveOnlyTypes;
465+
llvm::DenseMap<CanType, SILMoveOnlyWrappedType *> SILMoveOnlyWrappedTypes;
466466
llvm::FoldingSet<SILBoxType> SILBoxTypes;
467467
llvm::DenseMap<BuiltinIntegerWidth, BuiltinIntegerType*> IntegerTypes;
468468
llvm::FoldingSet<BuiltinVectorType> BuiltinVectorTypes;
@@ -4078,17 +4078,18 @@ SILFunctionType::SILFunctionType(
40784078
#endif
40794079
}
40804080

4081-
CanSILMoveOnlyType SILMoveOnlyType::get(CanType innerType) {
4081+
CanSILMoveOnlyWrappedType SILMoveOnlyWrappedType::get(CanType innerType) {
40824082
ASTContext &ctx = innerType->getASTContext();
4083-
auto found = ctx.getImpl().SILMoveOnlyTypes.find(innerType);
4084-
if (found != ctx.getImpl().SILMoveOnlyTypes.end())
4085-
return CanSILMoveOnlyType(found->second);
4083+
auto found = ctx.getImpl().SILMoveOnlyWrappedTypes.find(innerType);
4084+
if (found != ctx.getImpl().SILMoveOnlyWrappedTypes.end())
4085+
return CanSILMoveOnlyWrappedType(found->second);
40864086

4087-
void *mem = ctx.Allocate(sizeof(SILMoveOnlyType), alignof(SILMoveOnlyType));
4087+
void *mem = ctx.Allocate(sizeof(SILMoveOnlyWrappedType),
4088+
alignof(SILMoveOnlyWrappedType));
40884089

4089-
auto *storageTy = new (mem) SILMoveOnlyType(innerType);
4090-
ctx.getImpl().SILMoveOnlyTypes.insert({innerType, storageTy});
4091-
return CanSILMoveOnlyType(storageTy);
4090+
auto *storageTy = new (mem) SILMoveOnlyWrappedType(innerType);
4091+
ctx.getImpl().SILMoveOnlyWrappedTypes.insert({innerType, storageTy});
4092+
return CanSILMoveOnlyWrappedType(storageTy);
40924093
}
40934094

40944095
CanSILBlockStorageType SILBlockStorageType::get(CanType captureType) {

‎lib/AST/ASTDumper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3941,7 +3941,8 @@ namespace {
39413941
PrintWithColorRAII(OS, ParenthesisColor) << ')';
39423942
}
39433943

3944-
void visitSILMoveOnlyType(SILMoveOnlyType *T, StringRef label) {
3944+
void visitSILMoveOnlyWrappedType(SILMoveOnlyWrappedType *T,
3945+
StringRef label) {
39453946
printCommon(label, "sil_move_only_type");
39463947
printRec(T->getInnerType());
39473948
PrintWithColorRAII(OS, ParenthesisColor) << ')';

‎lib/AST/ASTMangler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@ void ASTMangler::appendType(Type type, GenericSignature sig,
14731473

14741474
return;
14751475
}
1476-
case TypeKind::SILMoveOnly:
1476+
case TypeKind::SILMoveOnlyWrapped:
14771477
// If we hit this, we just mangle the underlying name and move on.
14781478
llvm_unreachable("should never be mangled?");
14791479
case TypeKind::SILBlockStorage:

‎lib/AST/ASTPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6203,7 +6203,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
62036203
}
62046204
}
62056205

6206-
void visitSILMoveOnlyType(SILMoveOnlyType *T) {
6206+
void visitSILMoveOnlyWrappedType(SILMoveOnlyWrappedType *T) {
62076207
Printer << "@moveOnly ";
62086208
printWithParensIfNotSimple(T->getInnerType());
62096209
}

0 commit comments

Comments
 (0)