Skip to content

Commit 2f79cf7

Browse files
Merge pull request #1968 from adrian-prantl/66928085
Sort the cases in GetTypeClass (NFC)
2 parents 2ea629d + bfe6989 commit 2f79cf7

File tree

1 file changed

+14
-38
lines changed

1 file changed

+14
-38
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5580,18 +5580,11 @@ lldb::TypeClass SwiftASTContext::GetTypeClass(opaque_compiler_type_t type) {
55805580
swift::CanType swift_can_type(GetCanonicalSwiftType(type));
55815581
const swift::TypeKind type_kind = swift_can_type->getKind();
55825582
switch (type_kind) {
5583-
case swift::TypeKind::Error:
5584-
return lldb::eTypeClassOther;
55855583
case swift::TypeKind::BuiltinInteger:
5586-
return lldb::eTypeClassBuiltin;
55875584
case swift::TypeKind::BuiltinFloat:
5588-
return lldb::eTypeClassBuiltin;
55895585
case swift::TypeKind::BuiltinRawPointer:
5590-
return lldb::eTypeClassBuiltin;
55915586
case swift::TypeKind::BuiltinNativeObject:
5592-
return lldb::eTypeClassBuiltin;
55935587
case swift::TypeKind::BuiltinUnsafeValueBuffer:
5594-
return lldb::eTypeClassBuiltin;
55955588
case swift::TypeKind::BuiltinBridgeObject:
55965589
return lldb::eTypeClassBuiltin;
55975590
case swift::TypeKind::BuiltinVector:
@@ -5603,56 +5596,39 @@ lldb::TypeClass SwiftASTContext::GetTypeClass(opaque_compiler_type_t type) {
56035596
case swift::TypeKind::WeakStorage:
56045597
return ToCompilerType(swift_can_type->getReferenceStorageReferent())
56055598
.GetTypeClass();
5606-
case swift::TypeKind::GenericTypeParam:
5607-
return lldb::eTypeClassOther;
5608-
case swift::TypeKind::DependentMember:
5609-
return lldb::eTypeClassOther;
56105599
case swift::TypeKind::Enum:
5600+
case swift::TypeKind::BoundGenericEnum:
56115601
return lldb::eTypeClassUnion;
56125602
case swift::TypeKind::Struct:
5603+
case swift::TypeKind::BoundGenericStruct:
56135604
return lldb::eTypeClassStruct;
56145605
case swift::TypeKind::Class:
5606+
case swift::TypeKind::BoundGenericClass:
56155607
return lldb::eTypeClassClass;
5608+
case swift::TypeKind::GenericTypeParam:
5609+
case swift::TypeKind::DependentMember:
56165610
case swift::TypeKind::Protocol:
5617-
return lldb::eTypeClassOther;
5611+
case swift::TypeKind::ProtocolComposition:
56185612
case swift::TypeKind::Metatype:
5619-
return lldb::eTypeClassOther;
56205613
case swift::TypeKind::Module:
5621-
return lldb::eTypeClassOther;
56225614
case swift::TypeKind::PrimaryArchetype:
56235615
case swift::TypeKind::OpenedArchetype:
56245616
case swift::TypeKind::NestedArchetype:
5625-
return lldb::eTypeClassOther;
5626-
case swift::TypeKind::Function:
5627-
return lldb::eTypeClassFunction;
5628-
case swift::TypeKind::GenericFunction:
5629-
return lldb::eTypeClassFunction;
5630-
case swift::TypeKind::ProtocolComposition:
5631-
return lldb::eTypeClassOther;
5632-
case swift::TypeKind::LValue:
5633-
return lldb::eTypeClassReference;
56345617
case swift::TypeKind::UnboundGeneric:
5635-
return lldb::eTypeClassOther;
5636-
case swift::TypeKind::BoundGenericClass:
5637-
return lldb::eTypeClassClass;
5638-
case swift::TypeKind::BoundGenericEnum:
5639-
return lldb::eTypeClassUnion;
5640-
case swift::TypeKind::BoundGenericStruct:
5641-
return lldb::eTypeClassStruct;
56425618
case swift::TypeKind::TypeVariable:
5643-
return lldb::eTypeClassOther;
56445619
case swift::TypeKind::ExistentialMetatype:
5645-
return lldb::eTypeClassOther;
5646-
case swift::TypeKind::DynamicSelf:
5647-
return lldb::eTypeClassOther;
56485620
case swift::TypeKind::SILBox:
5649-
return lldb::eTypeClassOther;
5650-
case swift::TypeKind::SILFunction:
5651-
return lldb::eTypeClassFunction;
5621+
case swift::TypeKind::DynamicSelf:
56525622
case swift::TypeKind::SILBlockStorage:
5653-
return lldb::eTypeClassOther;
56545623
case swift::TypeKind::Unresolved:
5624+
case swift::TypeKind::Error:
56555625
return lldb::eTypeClassOther;
5626+
case swift::TypeKind::Function:
5627+
case swift::TypeKind::GenericFunction:
5628+
case swift::TypeKind::SILFunction:
5629+
return lldb::eTypeClassFunction;
5630+
case swift::TypeKind::LValue:
5631+
return lldb::eTypeClassReference;
56565632

56575633
case swift::TypeKind::Optional:
56585634
case swift::TypeKind::TypeAlias:

0 commit comments

Comments
 (0)