Merge pull request #11556 from hamishknight/fish-whisperer-rebranch

[rebranch] [lldb] Update for removal of UnresolvedType

Author: hamishknight

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

@@ -6137,7 +6137,6 @@ SwiftASTContext::GetTypeInfo(opaque_compiler_type_t type,
   case swift::TypeKind::SILMoveOnlyWrapped:
   case swift::TypeKind::SILToken:
   case swift::TypeKind::TypeVariable:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     LOG_PRINTF(GetLog(LLDBLog::Types), "Unexpected type: %s",
                swift_can_type.getString().c_str());
@@ -6301,7 +6300,6 @@ lldb::TypeClass SwiftASTContext::GetTypeClass(opaque_compiler_type_t type) {
   case swift::TypeKind::SILPack:
   case swift::TypeKind::SILToken:
   case swift::TypeKind::PackArchetype:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     assert(false && "Internal compiler type");
     break;
@@ -6809,7 +6807,6 @@ lldb::Encoding SwiftASTContext::GetEncoding(opaque_compiler_type_t type,
   case swift::TypeKind::PackArchetype:
   case swift::TypeKind::TypeVariable:
   case swift::TypeKind::ErrorUnion:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     break;
   case swift::TypeKind::BuiltinInteger:
@@ -6937,7 +6934,6 @@ SwiftASTContext::GetNumChildren(opaque_compiler_type_t type,
   case swift::TypeKind::SILPack:
   case swift::TypeKind::SILToken:
   case swift::TypeKind::TypeVariable:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     break;
   case swift::TypeKind::UnmanagedStorage:
@@ -7066,7 +7062,6 @@ uint32_t SwiftASTContext::GetNumFields(opaque_compiler_type_t type,
   case swift::TypeKind::SILPack:
   case swift::TypeKind::SILToken:
   case swift::TypeKind::TypeVariable:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     break;
   case swift::TypeKind::UnmanagedStorage:
@@ -7295,7 +7290,6 @@ CompilerType SwiftASTContext::GetFieldAtIndex(opaque_compiler_type_t type,
   case swift::TypeKind::SILPack:
   case swift::TypeKind::SILToken:
   case swift::TypeKind::TypeVariable:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     break;
   case swift::TypeKind::UnmanagedStorage:
@@ -7514,7 +7508,6 @@ uint32_t SwiftASTContext::GetNumPointeeChildren(opaque_compiler_type_t type) {
   case swift::TypeKind::Tuple:
   case swift::TypeKind::TypeVariable:
   case swift::TypeKind::UnboundGeneric:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     return 0;
   case swift::TypeKind::BuiltinInteger:
@@ -7667,7 +7660,6 @@ llvm::Expected<CompilerType> SwiftASTContext::GetChildCompilerTypeAtIndex(
   case swift::TypeKind::SILToken:
   case swift::TypeKind::TypeVariable:
   case swift::TypeKind::UnboundGeneric:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     break;
 
@@ -8063,7 +8055,6 @@ size_t SwiftASTContext::GetIndexOfChildMemberWithName(
     case swift::TypeKind::SILToken:
     case swift::TypeKind::TypeVariable:
     case swift::TypeKind::UnboundGeneric:
-    case swift::TypeKind::Unresolved:
     case swift::TypeKind::VariadicSequence:
       break;
 
@@ -8456,7 +8447,6 @@ bool SwiftASTContext::DumpTypeValue(
   case swift::TypeKind::Tuple:
   case swift::TypeKind::TypeVariable:
   case swift::TypeKind::UnboundGeneric:
-  case swift::TypeKind::Unresolved:
   case swift::TypeKind::VariadicSequence:
     break;