Merge pull request #1509 from adrian-prantl/getcanonical-next

Implement TypeSystemSwiftTypeRef::getCanonicalType() (NFC) #1507

Author: adrian-prantl

lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp

@@ -1037,13 +1037,12 @@ bool lldb_private::formatters::swift::SIMDVector_SummaryProvider(
   // dynamic archetype (and hence its size). Everything follows naturally
   // as the elements are laid out in a contigous buffer without padding.
   CompilerType simd_type = valobj.GetCompilerType().GetCanonicalType();
-  void *type_buffer = reinterpret_cast<void *>(simd_type.GetOpaqueQualType());
   llvm::Optional<uint64_t> opt_type_size = simd_type.GetByteSize(nullptr);
   if (!opt_type_size)
     return false;
   uint64_t type_size = *opt_type_size;
 
-  auto swift_type = reinterpret_cast<::swift::TypeBase *>(type_buffer);
+  ::swift::TypeBase *swift_type = GetSwiftType(simd_type).getPointer();
   auto bound_type = dyn_cast<::swift::BoundGenericType>(swift_type);
   if (!bound_type)
     return false;

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h

@@ -179,6 +179,8 @@ class TypeSystemSwift : public TypeSystem {
   }
   lldb::LanguageType
   GetMinimumLanguage(lldb::opaque_compiler_type_t type) override {
+    assert(type && "CompilerType::GetMinimumLanguage() is not supposed to "
+                   "forward calls with NULL types ");
     return lldb::eLanguageTypeSwift;
   }
   unsigned GetTypeQualifiers(lldb::opaque_compiler_type_t type) override {

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

@@ -1500,7 +1500,15 @@ TypeSystemSwiftTypeRef::GetArrayElementType(opaque_compiler_type_t type,
 }
 CompilerType
 TypeSystemSwiftTypeRef::GetCanonicalType(opaque_compiler_type_t type) {
-  return m_swift_ast_context->GetCanonicalType(ReconstructType(type));
+  auto impl = [&]() {
+    using namespace swift::Demangle;
+    Demangler Dem;
+    NodePointer canonical =
+        GetCanonicalDemangleTree(GetModule(), Dem, AsMangledName(type));
+    ConstString mangled(mangleNode(canonical));
+    return GetTypeFromMangledTypename(mangled);
+  };
+  VALIDATE_AND_RETURN(impl, GetCanonicalType, type, (ReconstructType(type)));
 }
 int TypeSystemSwiftTypeRef::GetFunctionArgumentCount(
     opaque_compiler_type_t type) {