Adapt DWARFDIE to upstream changes

Author: adrian-prantl

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

@@ -390,8 +390,29 @@ Type *DWARFDIE::ResolveTypeUID(const DWARFDIE &die) const {
 
 static CompilerContext GetContextEntry(DWARFDIE die,
                                        bool derive_template_names) {
-  auto ctx = [die](CompilerContextKind kind) {
-    return CompilerContext(kind, ConstString(die.GetName()));
+  auto get_name = [](DWARFDIE die) {
+    const char *name = die.GetName();
+#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 && 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())
+        return ConstString(base_name).AsCString();
+    }
+#endif
+    return name;
+  };
+
+  auto ctx = [&](CompilerContextKind kind) {
+    return CompilerContext(kind, ConstString(get_name(die)));
   };
 
   switch (die.Tag()) {
@@ -415,7 +436,7 @@ static CompilerContext GetContextEntry(DWARFDIE die,
     CompilerContextKind kind = die.Tag() == DW_TAG_union_type
                                    ? CompilerContextKind::Union
                                    : CompilerContextKind::ClassOrStruct;
-    llvm::StringRef name = die.GetName();
+    llvm::StringRef name = get_name(die);
     if (!derive_template_names || name.contains('<'))
       return CompilerContext(kind, ConstString(name));
 
@@ -442,25 +463,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: