Merge pull request #3796 from DougGregor/swift-nested-archetype-removal-20210726

Work around upcoming removal of NestedArchetypeType.

Author: DougGregor

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -2276,7 +2276,9 @@ SwiftLanguageRuntimeImpl::BindGenericTypeParameters(StackFrame &stack_frame,
           [&](swift::SubstitutableType *type) -> swift::Type {
             auto opaque_type =
                 llvm::dyn_cast<swift::OpaqueTypeArchetypeType>(type);
-            if (!opaque_type)
+            if (!opaque_type ||
+                !opaque_type->getInterfaceType()
+                  ->is<swift::GenericTypeParamType>())
               return type;
 
             // Try to find the symbol for the opaque type descriptor in the
@@ -2308,11 +2310,13 @@ SwiftLanguageRuntimeImpl::BindGenericTypeParameters(StackFrame &stack_frame,
 
               // Ask RemoteAST to get the underlying type out of the descriptor.
               auto &remote_ast = GetRemoteASTContext(*scratch_ctx);
+              auto genericParam = opaque_type->getInterfaceType()
+                  ->getAs<swift::GenericTypeParamType>();
               auto underlying_type_result =
                   remote_ast.getUnderlyingTypeForOpaqueType(
                       swift::remote::RemoteAddress(addr),
                       opaque_type->getSubstitutions(),
-                      opaque_type->getOrdinal());
+                      genericParam->getIndex());
 
               if (!underlying_type_result)
                 continue;

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

@@ -5644,7 +5644,6 @@ SwiftASTContext::GetTypeInfo(opaque_compiler_type_t type,
   case swift::TypeKind::Error:
   case swift::TypeKind::InOut:
   case swift::TypeKind::Module:
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::Placeholder:
@@ -5829,7 +5828,6 @@ lldb::TypeClass SwiftASTContext::GetTypeClass(opaque_compiler_type_t type) {
   case swift::TypeKind::Existential:
   case swift::TypeKind::Metatype:
   case swift::TypeKind::Module:
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -6289,7 +6287,6 @@ lldb::Encoding SwiftASTContext::GetEncoding(opaque_compiler_type_t type,
   case swift::TypeKind::BuiltinFloat:
     return lldb::eEncodingIEEE754; // TODO: detect if an integer is unsigned
 
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -6430,7 +6427,6 @@ uint32_t SwiftASTContext::GetNumChildren(opaque_compiler_type_t type,
 
   case swift::TypeKind::ExistentialMetatype:
   case swift::TypeKind::Metatype:
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -6567,7 +6563,6 @@ uint32_t SwiftASTContext::GetNumFields(opaque_compiler_type_t type,
   case swift::TypeKind::Metatype:
     return 0;
 
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -6865,7 +6860,6 @@ CompilerType SwiftASTContext::GetFieldAtIndex(opaque_compiler_type_t type,
   case swift::TypeKind::Metatype:
     break;
 
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -6941,7 +6935,6 @@ uint32_t SwiftASTContext::GetNumPointeeChildren(opaque_compiler_type_t type) {
   case swift::TypeKind::Class:
   case swift::TypeKind::Protocol:
   case swift::TypeKind::Metatype:
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -7296,7 +7289,6 @@ CompilerType SwiftASTContext::GetChildCompilerTypeAtIndex(
   case swift::TypeKind::Metatype:
     break;
 
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype:
@@ -7532,7 +7524,6 @@ size_t SwiftASTContext::GetIndexOfChildMemberWithName(
     case swift::TypeKind::Metatype:
       break;
 
-    case swift::TypeKind::NestedArchetype:
     case swift::TypeKind::OpaqueTypeArchetype:
     case swift::TypeKind::OpenedArchetype:
     case swift::TypeKind::PrimaryArchetype:
@@ -7789,7 +7780,6 @@ bool SwiftASTContext::DumpTypeValue(
   case swift::TypeKind::BuiltinNativeObject:
   case swift::TypeKind::BuiltinUnsafeValueBuffer:
   case swift::TypeKind::BuiltinBridgeObject:
-  case swift::TypeKind::NestedArchetype:
   case swift::TypeKind::OpaqueTypeArchetype:
   case swift::TypeKind::OpenedArchetype:
   case swift::TypeKind::PrimaryArchetype: