Merge pull request #2268 from adrian-prantl/68171397-next

Implement TypeSystemSwiftTypeRef::GetReferentType()

Author: adrian-prantl

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

@@ -2515,7 +2515,21 @@ CompilerType TypeSystemSwiftTypeRef::GetErrorType() {
 
 CompilerType
 TypeSystemSwiftTypeRef::GetReferentType(opaque_compiler_type_t type) {
-  return m_swift_ast_context->GetReferentType(ReconstructType(type));
+  auto impl = [&]() -> CompilerType {
+    using namespace swift::Demangle;
+    Demangler dem;
+    NodePointer node = GetDemangledType(dem, AsMangledName(type));
+    if (!node ||
+        (node->getKind() != Node::Kind::Unowned &&
+         node->getKind() != Node::Kind::Unmanaged) ||
+        !node->hasChildren())
+      return {this, type};
+    node = node->getFirstChild();
+    if (!node || node->getKind() != Node::Kind::Type || !node->hasChildren())
+      return {this, type};
+    return RemangleAsType(dem, node);
+  };
+  VALIDATE_AND_RETURN(impl, GetReferentType, type, (ReconstructType(type)));
 }
 
 CompilerType

lldb/source/Target/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -997,6 +997,7 @@ llvm::Optional<uint64_t> SwiftLanguageRuntimeImpl::GetMemberVariableOffset(
 
 static CompilerType GetWeakReferent(TypeSystemSwiftTypeRef &ts,
                                     CompilerType type) {
+  // FIXME: This is very similar to TypeSystemSwiftTypeRef::GetReferentType().
   using namespace swift::Demangle;
   Demangler dem;
   auto mangled = type.GetMangledTypeName().GetStringRef();