[LLDB] Remove Swift customizations from DWARFDIE

Author: adrian-prantl

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwiftDescriptorFinder.cpp

@@ -98,7 +98,7 @@ DWARFASTParserSwift::ResolveTypeAlias(lldb_private::CompilerType alias) {
   std::string alias_name = ts.GetBaseName(alias.GetOpaqueQualType());
   for (DWARFDIE child_die : parent_die.children()) {
     auto tag = child_die.Tag();
-    if (tag == DW_TAG_member)
+    if (tag == llvm::dwarf::DW_TAG_member)
       continue;
     std::string base_name;
     const auto *name =

lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp

@@ -13,9 +13,7 @@
 #include "DWARFDebugInfoEntry.h"
 #include "DWARFDeclContext.h"
 #include "DWARFUnit.h"
-#ifdef LLDB_ENABLE_SWIFT
-#include "Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h"
-#endif
+#include "LogChannelDWARF.h"
 #include "lldb/Symbol/Type.h"
 
 #include "llvm/ADT/iterator.h"
@@ -441,25 +439,6 @@ static void GetDeclContextImpl(DWARFDIE die, bool derive_template_names,
     }
 
     // Add this DIE's contribution at the end of the chain.
-    auto push_ctx = [&](CompilerContextKind kind, llvm::StringRef name) {
-#ifdef LLDB_ENABLE_SWIFT
-      // FIXME: This layering violation works around a limitation in
-      // LLVM that prevents swiftc from emitting both DW_AT_name and
-      // DW_AT_linkage_name on forward declarations and typedefs.
-      //
-      // We should not upstream this but instead fix the Swift compiler.
-      std::string base_name;
-      if (!name.empty() && name[0] == '$') {
-        // We should also check the unit's DW_LANG here.
-        const char *mangled = ConstString(name).AsCString();
-        base_name = TypeSystemSwiftTypeRef::GetBaseName(
-            (lldb::opaque_compiler_type_t)mangled);
-        if (!base_name.empty())
-          name = base_name;
-      }
-#endif
-      context.push_back({kind, ConstString(name)});
-    };
     switch (die.Tag()) {
     case DW_TAG_module:
     case DW_TAG_namespace:

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

@@ -1040,6 +1040,16 @@ TypeSystemSwiftTypeRef::ResolveTypeAlias(swift::Demangle::Demangler &dem,
   };
 
   TypeResults results;
+
+
+  std::vector<CompilerContext> decl_context;
+  BuildDeclContext(node, decl_context);
+  if (decl_context.size() &&
+      decl_context[0].kind == CompilerContextKind::Module &&
+      decl_context[0].name.GetStringRef().starts_with("__lldb"))
+    decl_context.erase(decl_context.begin());
+
+  //  TypeQuery query(decl_context, TypeQueryOptions::e_find_one);
   TypeQuery query(mangled.GetStringRef(), TypeQueryOptions::e_find_one);
   if (!prefer_clang_types) {
     // First check if this type has already been parsed from DWARF.
@@ -1059,7 +1069,6 @@ TypeSystemSwiftTypeRef::ResolveTypeAlias(swift::Demangle::Demangler &dem,
                         "Could not resolve type alias {0}: {1}",
                         mangled.AsCString());
       }
-
       // Do an even more expensive global search.
       target_sp->GetImages().FindTypes(/*search_first=*/nullptr, query,
                                        results);