Merge pull request #7356 from adrian-prantl/refactor-remove-ast

Remove TypeSystemSwiftTypeRef::getSwiftType() (NFC)

Author: adrian-prantl

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

@@ -44,20 +44,14 @@ using namespace lldb_private;
 namespace lldb_private {
 swift::Type GetSwiftType(CompilerType type) {
   auto ts = type.GetTypeSystem();
-  if (auto tr = ts.dyn_cast_or_null<TypeSystemSwiftTypeRef>())
-    return tr->GetSwiftType(type);
-  if (auto ast = ts.dyn_cast_or_null<SwiftASTContext>())
-    return ast->GetSwiftType(type);
+  if (auto tr = ts.dyn_cast_or_null<TypeSystemSwift>())
+    if (auto ast = tr->GetSwiftASTContext())
+      return ast->GetSwiftType(type);
   return {};
 }
 
 swift::CanType GetCanonicalSwiftType(CompilerType type) {
-  swift::Type swift_type = nullptr;
-  auto ts = type.GetTypeSystem();
-  if (auto tr = ts.dyn_cast_or_null<TypeSystemSwiftTypeRef>())
-    swift_type = tr->GetSwiftType(type);
-  if (auto ast = ts.dyn_cast_or_null<SwiftASTContext>())
-    swift_type = ast->GetSwiftType(type);
+  swift::Type swift_type = GetSwiftType(type);
   return swift_type ? swift_type->getCanonicalType() : swift::CanType();
 }
 

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

@@ -210,28 +210,19 @@ CompilerType SwiftASTContext::GetCompilerType(swift::TypeBase *swift_type) {
   return {weak_from_this(), swift_type};
 }
 
-swift::Type TypeSystemSwiftTypeRef::GetSwiftType(CompilerType compiler_type) {
-  auto ts =
-      compiler_type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwiftTypeRef>();
-  if (!ts)
-    return {};
-
-  // FIXME: Suboptimal performance, because the ConstString is looked up again.
-  ConstString mangled_name(
-      reinterpret_cast<const char *>(compiler_type.GetOpaqueQualType()));
-  if (auto *swift_ast_context = ts->GetSwiftASTContext())
-    return swift_ast_context->ReconstructType(mangled_name);
-  return {};
-}
-
 swift::Type SwiftASTContext::GetSwiftType(CompilerType compiler_type) {
   if (compiler_type.GetTypeSystem().isa_and_nonnull<SwiftASTContext>())
     return reinterpret_cast<swift::TypeBase *>(
         compiler_type.GetOpaqueQualType());
-  if (auto ts = compiler_type.GetTypeSystem()
-                    .dyn_cast_or_null<TypeSystemSwiftTypeRef>())
-    return ts->GetSwiftType(compiler_type);
 
+  // FIXME: Suboptimal performance, because the ConstString is looked up again.
+  if (auto ts = compiler_type.GetTypeSystem()
+      .dyn_cast_or_null<TypeSystemSwiftTypeRef>()) {
+    ConstString mangled_name(
+        reinterpret_cast<const char *>(compiler_type.GetOpaqueQualType()));
+    if (auto *swift_ast_context = ts->GetSwiftASTContext())
+      return swift_ast_context->ReconstructType(mangled_name);
+  }
   return {};
 }
 

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

@@ -17,8 +17,6 @@
 #include "lldb/Core/SwiftForward.h"
 #include "lldb/Core/ThreadSafeDenseMap.h"
 
-#include "swift/AST/Type.h"
-
 // FIXME: needed only for the DenseMap.
 #include "clang/APINotes/APINotesManager.h"
 #include "clang/Basic/Module.h"
@@ -72,8 +70,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   void ClearModuleDependentCaches() override;
   lldb::TargetWP GetTargetWP() const override { return {}; }
 
-  swift::CanType GetCanonicalSwiftType(CompilerType compiler_type);
-  swift::Type GetSwiftType(CompilerType compiler_type);
   CompilerType ReconstructType(CompilerType type);
   CompilerType
   GetTypeFromMangledTypename(ConstString mangled_typename) override;