[lldb] Change FindDefinitionTypeForDWARFDeclContext() to take DWARFDIE

[aeubanks]

Summary

This simplifies an upcoming patch.

[aeubanks]

update

[aeubanks]

update

[jasonmolenda]

Hi Arthur, this change is causing a testsuite failure on Darwin systems - see https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/48671/ on the "LLDB Incremental" bot - and I can reproduce this failure on my local mac. Would you like to revert this until you've had a chance to find the issue, or should I? It's a holiday weekend in the US & I would understand if you don't see this message for a while, I'll revert later today unless you suggest an alternative. Thanks.

[aeubanks]

In D138612#3949869, @jasonmolenda wrote:

Hi Arthur, this change is causing a testsuite failure on Darwin systems - see https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/48671/ on the "LLDB Incremental" bot - and I can reproduce this failure on my local mac. Would you like to revert this until you've had a chance to find the issue, or should I? It's a holiday weekend in the US & I would understand if you don't see this message for a while, I'll revert later today unless you suggest an alternative. Thanks.

Feel free to revert, but could you post the log file that the test looks at with and without the change?

[jasonmolenda]

In D138612#3950098, @aeubanks wrote:

In D138612#3949869, @jasonmolenda wrote:

Hi Arthur, this change is causing a testsuite failure on Darwin systems - see https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/48671/ on the "LLDB Incremental" bot - and I can reproduce this failure on my local mac. Would you like to revert this until you've had a chance to find the issue, or should I? It's a holiday weekend in the US & I would understand if you don't see this message for a while, I'll revert later today unless you suggest an alternative. Thanks.

Feel free to revert, but could you post the log file that the test looks at with and without the change?

The bot is also broken with Adrian Vogelsgesang's coroutines formatter right now and I was going to wait until tomorrow morning US time before I revert his patchsets, not sure which time zone he's in, so I won't do anything until then at least.

The bot has pretty good logs fwiw,

FAIL: test_dwarf (TestCPPAccelerator.CPPAcceleratorTableTestCase)
   Test that type lookups fail early (performance)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/packages/Python/lldbsuite/test/lldbtest.py", line 1691, in test_method
    return attrvalue(self)
  File "/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/packages/Python/lldbsuite/test/decorators.py", line 159, in wrapper
    return func(*args, **kwargs)
  File "/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py", line 32, in test
    self.assertEqual(n, 1, "".join(log))
AssertionError: 0 != 1 :  (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: DWARFASTParserClang::ParseTypeFromDWARF (die = 0x00000127, decl_ctx = 0x7fc72ebdb430 (die 0x0000000b)) DW_TAG_reference_type name = '(null)')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: DWARFASTParserClang::ParseTypeFromDWARF (die = 0x0000012c, decl_ctx = 0x7fc72ebdb430 (die 0x0000000b)) DW_TAG_class_type name = 'D')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: DWARFASTParserClang::ParseTypeFromDWARF (die = 0x00000142, decl_ctx = 0x7fc72ebdbca0 (die 0x0000012c)) DW_TAG_structure_type name = 'Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: SymbolFileDWARF(0x7fc72c4a7a50) - 0x00000142: DW_TAG_structure_type type "Inner" is a forward declaration, trying to find complete type
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/a.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/a.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner') trying die=0x00000061 (A::Inner)
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/b.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/b.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner') trying die=0x00000061 (B::Inner)
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/c.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/c.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner') trying die=0x00000061 (C::Inner)
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/d.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/d.o: SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=DW_TAG_structure_type, name='Inner') trying die=0x00000061 (D::Inner)
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/d.o: DWARFASTParserClang::ParseTypeFromDWARF (die = 0x0000004b, decl_ctx = 0x7fc72ebdb430 (die 0x0000000b)) DW_TAG_class_type name = 'D')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/d.o: DWARFASTParserClang::ParseTypeFromDWARF (die = 0x00000061, decl_ctx = 0x7fc72ebdbca0 (die 0x0000004b)) DW_TAG_class_type name = 'Inner')
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/main.o: SymbolFileDWARF(0x7fc72c4a7a50) - 0x00000142: DW_TAG_structure_type type "Inner" is a forward declaration, complete type is 0x500000061
 (x86_64) /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lldb-test-build.noindex/lang/cpp/accelerator-table/TestCPPAccelerator.test_dwarf/d.o: DWARFASTParserClang::ParseTypeFromDWARF (die = 0x0000007e, decl_ctx = 0x7fc72ebdb430 (die 0x0000000b)) DW_TAG_base_type name = 'int')

I didn't look into this patch enough to say whether this is a real failure, or if the test assumes behavior that is only true with the accelerator tables used in DWARF on linux, the apple ones used on macOS. In which case this may simply be a skipIfDarwin test, I don't know.

[jasonmolenda]

In D138612#3950102, @jasonmolenda wrote:

I didn't look into this patch enough to say whether this is a real failure, or if the test assumes behavior that is only true with the accelerator tables used in DWARF on linux, the apple ones used on macOS. In which case this may simply be a skipIfDarwin test, I don't know.

If this is a difference in behavior between the DWARF accelerator tables used on linux versus the apple accelerator tables used on macOS, it's an interesting question of whether this is pointing out a bug in the apple accelerator table support in lldb or something to do with how the tables are set up. If you don't have access to a macOS system to investigate more closely, and you don't think this is indicating a bug or regression in behavior, then I think skipping the test for now on darwin is not unreasonable. My two cents having not looked into any of these changes.

[jasonmolenda]

Reverted for now.

commit 1df47dbe131d2aed676d9d5e0441ff4b61fec018
Author: Jason Molenda <[e-mail]>
Date:   Fri Nov 25 12:11:37 2022 -0800

    Revert "[lldb][NFC] Change FindDefinitionTypeForDWARFDeclContext() to take DWARFDIE"
    
    The changes in https://reviews.llvm.org/D138612 cause a testsuite
    failure on Darwin systems in TestCPPAccelerator.py, first flagged
    by the "LLDB Incremental" CI bot.
    https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/
    with the specific failure text appended to the phabracator.
    
    This reverts commit c3c423b6cb2e1c00483e951ce8cc4d935e31cd14.

[jasonmolenda]

FWIW when I was commenting on this last night, I hadn't realized that the test case was unmodified by the patch. Reverting the patch until we can figure out the cause of the behavior change made the most sense. The macOS incremental bot is green now.

[aeubanks]

The bot has pretty good logs fwiw,

I don't have easy access to a mac, knowing what the logs are when the test is passing would be helpful with figuring out what's going wrong and relanding.

[aeubanks]

potential test fix

[aeubanks]

@jasonmolenda could you run check-lldb with this patch? I think this patch may fix the test by changing its expectations for logging.

(removed "NFC" from title because the logging changes actually mattered)

[aeubanks]

go back to calling m_index->GetTypes(DWARFDeclContext) instead of m_index->GetTypes(StringRef)

these have different codepaths, I mistakenly thought they were equivalent

[aeubanks]

I borrowed a mac and verified that this patch fixes the test

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

TypeSP DWARFASTParserClang::ParseEnum(const SymbolContext &sc,
   const dw_tag_t tag = die.Tag();
   TypeSP type_sp;
 
   if (attrs.is_forward_declaration) {
     type_sp = ParseTypeFromClangModule(sc, die, log);
     if (type_sp)
       return type_sp;
 
-    DWARFDeclContext die_decl_ctx = SymbolFileDWARF::GetDWARFDeclContext(die);
-
-    type_sp = dwarf->FindDefinitionTypeForDWARFDeclContext(die_decl_ctx);
+    type_sp = dwarf->FindDefinitionTypeForDWARFDeclContext(die);
 
     if (!type_sp) {
       SymbolFileDWARFDebugMap *debug_map_symfile = dwarf->GetDebugMapSymfile();
       if (debug_map_symfile) {
         // We weren't able to find a full declaration in this DWARF,
         // see if we have a declaration anywhere else...
-        type_sp = debug_map_symfile->FindDefinitionTypeForDWARFDeclContext(
-            die_decl_ctx);
+        type_sp = debug_map_symfile->FindDefinitionTypeForDWARFDeclContext(die);
       }
     }
 
     if (type_sp) {
       if (log) {
         dwarf->GetObjectFile()->GetModule()->LogMessage(
             log,
             "SymbolFileDWARF(%p) - 0x%8.8x: %s type \"%s\" is a "
if (attrs.is_forward_declaration) {
     }
 
     // See if the type comes from a Clang module and if so, track down
     // that type.
     type_sp = ParseTypeFromClangModule(sc, die, log);
     if (type_sp)
       return type_sp;
 
-    DWARFDeclContext die_decl_ctx = SymbolFileDWARF::GetDWARFDeclContext(die);
-
     // type_sp = FindDefinitionTypeForDIE (dwarf_cu, die,
     // type_name_const_str);
-    type_sp = dwarf->FindDefinitionTypeForDWARFDeclContext(die_decl_ctx);
+    type_sp = dwarf->FindDefinitionTypeForDWARFDeclContext(die);
 
     if (!type_sp) {
       SymbolFileDWARFDebugMap *debug_map_symfile = dwarf->GetDebugMapSymfile();
       if (debug_map_symfile) {
         // We weren't able to find a full declaration in this DWARF, see
         // if we have a declaration anywhere else...
-        type_sp = debug_map_symfile->FindDefinitionTypeForDWARFDeclContext(
-            die_decl_ctx);
+        type_sp = debug_map_symfile->FindDefinitionTypeForDWARFDeclContext(die);
       }
     }
 
     if (type_sp) {
       if (log) {
         dwarf->GetObjectFile()->GetModule()->LogMessage(
             log,
             "SymbolFileDWARF(%p) - 0x%8.8x: %s type \"%s\" is a "

lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h

lldb_private::ConstString GetQualifiedNameAsConstString() const {
     return lldb_private::ConstString(GetQualifiedName());
   }
 
   void Clear() {
     m_entries.clear();
     m_qualified_name.clear();
   }
 
-  lldb::LanguageType GetLanguage() const { return m_language; }
-
-  void SetLanguage(lldb::LanguageType language) { m_language = language; }
-
 protected:
   typedef std::vector<Entry> collection;
   collection m_entries;
   mutable std::string m_qualified_name;
-  lldb::LanguageType m_language = lldb::eLanguageTypeUnknown;
 };
 
 #endif // LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_DWARFDECLCONTEXT_H

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h

protected:
   /// Resolve functions and (possibly) blocks for the given file address and a
   /// compile unit. The compile unit comes from the sc argument and it must be
   /// set. The results of the lookup (if any) are written back to the symbol
   /// context.
   void ResolveFunctionAndBlock(lldb::addr_t file_vm_addr, bool lookup_block,
                                lldb_private::SymbolContext &sc);
 
   virtual lldb::TypeSP
-  FindDefinitionTypeForDWARFDeclContext(const DWARFDeclContext &die_decl_ctx);
+  FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die);
 
   virtual lldb::TypeSP
   FindCompleteObjCDefinitionTypeForDIE(const DWARFDIE &die,
                                        lldb_private::ConstString type_name,
                                        bool must_be_implementation);
 
   lldb_private::Symbol *
   GetObjCClassSymbol(lldb_private::ConstString objc_class_name);

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

if (name1 && name2) {
       return false;
     }
   }
   // We made it through all of the checks and the declaration contexts are
   // equal.
   return true;
 }
 
-TypeSP SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(
-    const DWARFDeclContext &dwarf_decl_ctx) {
+TypeSP
+SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die) {
   TypeSP type_sp;
 
-  const uint32_t dwarf_decl_ctx_count = dwarf_decl_ctx.GetSize();
-  if (dwarf_decl_ctx_count > 0) {
-    const ConstString type_name(dwarf_decl_ctx[0].name);
-    const dw_tag_t tag = dwarf_decl_ctx[0].tag;
+  if (die.GetName()) {
+    const dw_tag_t tag = die.Tag();
 
-    if (type_name) {
-      Log *log = GetLog(DWARFLog::TypeCompletion | DWARFLog::Lookups);
-      if (log) {
-        GetObjectFile()->GetModule()->LogMessage(
-            log,
-            "SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=%"
-            "s, qualified-name='%s')",
-            DW_TAG_value_to_name(dwarf_decl_ctx[0].tag),
-            dwarf_decl_ctx.GetQualifiedName());
-      }
+          "s, name='%s')",
+          DW_TAG_value_to_name(tag), die.GetName());
 
-      // Get the type system that we are looking to find a type for. We will
-      // use this to ensure any matches we find are in a language that this
-      // type system supports
-      const LanguageType language = dwarf_decl_ctx.GetLanguage();
-      TypeSystemSP type_system = nullptr;
-      if (language != eLanguageTypeUnknown) {
-        auto type_system_or_err = GetTypeSystemForLanguage(language);
-        if (auto err = type_system_or_err.takeError()) {
-          LLDB_LOG_ERROR(GetLog(LLDBLog::Symbols), std::move(err),
-                         "Cannot get TypeSystem for language {}",
-                         Language::GetNameForLanguageType(language));
-        } else {
-          type_system = *type_system_or_err;
-        }
-      }
+    const LanguageType language = GetLanguage(*die.GetCU());
 
-      m_index->GetTypes(dwarf_decl_ctx, [&](DWARFDIE type_die) {
-        // Make sure type_die's language matches the type system we are
-        // looking for. We don't want to find a "Foo" type from Java if we
-        // are looking for a "Foo" type for C, C++, ObjC, or ObjC++.
-        if (type_system &&
-            !type_system->SupportsLanguage(GetLanguage(*type_die.GetCU())))
-          return true;
-        bool try_resolving_type = false;
+    m_index->GetTypes(GetDWARFDeclContext(die), [&](DWARFDIE type_die) {
 
-        // Don't try and resolve the DIE we are looking for with the DIE
-        // itself!
-        const dw_tag_t type_tag = type_die.Tag();
-        // Make sure the tags match
-        if (type_tag == tag) {
-          // The tags match, lets try resolving this type
-          try_resolving_type = true;
-        } else {
-          // The tags don't match, but we need to watch our for a forward
-          // declaration for a struct and ("struct foo") ends up being a
-          // class ("class foo { ... };") or vice versa.
-          switch (type_tag) {
-          case DW_TAG_class_type:
-            // We had a "class foo", see if we ended up with a "struct foo
-            // { ... };"
-            try_resolving_type = (tag == DW_TAG_structure_type);
-            break;
-          case DW_TAG_structure_type:
-            // We had a "struct foo", see if we ended up with a "class foo
-            // { ... };"
-            try_resolving_type = (tag == DW_TAG_class_type);
-            break;
-          default:
-            // Tags don't match, don't event try to resolve using this type
-            // whose name matches....
-            break;
-          }
-        }
 
-        if (!try_resolving_type) {
-          if (log) {
-            GetObjectFile()->GetModule()->LogMessage(
-                log,
-                "SymbolFileDWARF::"
-                "FindDefinitionTypeForDWARFDeclContext(tag=%s, "
-                "qualified-name='%s') ignoring die=0x%8.8x (%s)",
-                DW_TAG_value_to_name(dwarf_decl_ctx[0].tag),
-                dwarf_decl_ctx.GetQualifiedName(), type_die.GetOffset(),
-                type_die.GetName());
-          }
-          return true;
-        }
+              "name='%s') ignoring die=0x%8.8x (%s)",
+              DW_TAG_value_to_name(tag), die.GetName(), type_die.GetOffset(),
 
-        DWARFDeclContext type_dwarf_decl_ctx = GetDWARFDeclContext(type_die);
 
-        if (log) {
-          GetObjectFile()->GetModule()->LogMessage(
-              log,
-              "SymbolFileDWARF::"
-              "FindDefinitionTypeForDWARFDeclContext(tag=%s, "
-              "qualified-name='%s') trying die=0x%8.8x (%s)",
-              DW_TAG_value_to_name(dwarf_decl_ctx[0].tag),
-              dwarf_decl_ctx.GetQualifiedName(), type_die.GetOffset(),
-              type_dwarf_decl_ctx.GetQualifiedName());
-        }
+            "name='%s') trying die=0x%8.8x (%s)",
+            DW_TAG_value_to_name(tag), die.GetName(), type_die.GetOffset(),
 
-        // Make sure the decl contexts match all the way up
-        if (dwarf_decl_ctx != type_dwarf_decl_ctx)
-          return true;
+      if (GetDWARFDeclContext(die) != type_dwarf_decl_ctx)
 
-        Type *resolved_type = ResolveType(type_die, false);
-        if (!resolved_type || resolved_type == DIE_IS_BEING_PARSED)
-          return true;
 
-        type_sp = resolved_type->shared_from_this();
-        return false;
-      });
-    }
-  }
   return type_sp;
 }
 
 TypeSP SymbolFileDWARF::ParseType(const SymbolContext &sc, const DWARFDIE &die,
                                   bool *type_is_new_ptr) {
   if (!die)
     return {};
 
SymbolFileDWARF::GetContainingDeclContext(const DWARFDIE &die) {
   return CompilerDeclContext();
 }
 
 DWARFDeclContext SymbolFileDWARF::GetDWARFDeclContext(const DWARFDIE &die) {
   if (!die.IsValid())
     return {};
   DWARFDeclContext dwarf_decl_ctx =
       die.GetDIE()->GetDWARFDeclContext(die.GetCU());
-  dwarf_decl_ctx.SetLanguage(GetLanguage(*die.GetCU()));
   return dwarf_decl_ctx;
 }
 
 LanguageType SymbolFileDWARF::LanguageTypeFromDWARF(uint64_t val) {
   // Note: user languages between lo_user and hi_user must be handled
   // explicitly here.
   switch (val) {
   case DW_LANG_Mips_Assembler:

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h

protected:
   /// Returns the compile unit associated with the dwarf compile unit. This may
   /// be one of the extra compile units an object file contains which isn't
   /// reachable by ParseCompileUnitAtIndex(uint32_t).
   lldb::CompUnitSP GetCompileUnit(SymbolFileDWARF *oso_dwarf,
                                   DWARFCompileUnit &dwarf_cu);
 
   CompileUnitInfo *GetCompileUnitInfo(SymbolFileDWARF *oso_dwarf);
 
-  lldb::TypeSP
-  FindDefinitionTypeForDWARFDeclContext(const DWARFDeclContext &die_decl_ctx);
+  lldb::TypeSP FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die);
 
   bool Supports_DW_AT_APPLE_objc_complete_type(SymbolFileDWARF *skip_dwarf_oso);
 
   lldb::TypeSP FindCompleteObjCDefinitionTypeForDIE(
       const DWARFDIE &die, lldb_private::ConstString type_name,
       bool must_be_implementation);
 
   UniqueDWARFASTTypeMap &GetUniqueDWARFASTTypeMap() {

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

SymbolFileDWARFDebugMap::ParseCallEdgesInFunction(UserID func_id) {
   uint32_t oso_idx = GetOSOIndexFromUserID(func_id.GetID());
   SymbolFileDWARF *oso_dwarf = GetSymbolFileByOSOIndex(oso_idx);
   if (oso_dwarf)
     return oso_dwarf->ParseCallEdgesInFunction(func_id);
   return {};
 }
 
 TypeSP SymbolFileDWARFDebugMap::FindDefinitionTypeForDWARFDeclContext(
-    const DWARFDeclContext &die_decl_ctx) {
+    const DWARFDIE &die) {
   TypeSP type_sp;
   ForEachSymbolFile([&](SymbolFileDWARF *oso_dwarf) -> bool {
-    type_sp = oso_dwarf->FindDefinitionTypeForDWARFDeclContext(die_decl_ctx);
+    type_sp = oso_dwarf->FindDefinitionTypeForDWARFDeclContext(die);
     return ((bool)type_sp);
   });
   return type_sp;
 }
 
 bool SymbolFileDWARFDebugMap::Supports_DW_AT_APPLE_objc_complete_type(
     SymbolFileDWARF *skip_dwarf_oso) {
   if (m_supports_DW_AT_APPLE_objc_complete_type == eLazyBoolCalculate) {

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h

protected:
   DIEToVariableSP &GetDIEToVariable() override;
 
   DIEToClangType &GetForwardDeclDieToClangType() override;
 
   ClangTypeToDIE &GetForwardDeclClangTypeToDie() override;
 
   UniqueDWARFASTTypeMap &GetUniqueDWARFASTTypeMap() override;
 
-  lldb::TypeSP FindDefinitionTypeForDWARFDeclContext(
-      const DWARFDeclContext &die_decl_ctx) override;
+  lldb::TypeSP
+  FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die) override;
 
   lldb::TypeSP FindCompleteObjCDefinitionTypeForDIE(
       const DWARFDIE &die, lldb_private::ConstString type_name,
       bool must_be_implementation) override;
 
   SymbolFileDWARF &GetBaseSymbolFile() const { return m_base_symbol_file; }
 
   /// If this file contains exactly one compile unit, this function will return
   /// it. Otherwise it returns nullptr.
   DWARFCompileUnit *FindSingleCompileUnit();
 
   SymbolFileDWARF &m_base_symbol_file;
 };
 
 #endif // LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_SYMBOLFILEDWARFDWO_H

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

void SymbolFileDWARFDwo::GetObjCMethods(
     llvm::function_ref<bool(DWARFDIE die)> callback) {
   GetBaseSymbolFile().GetObjCMethods(class_name, callback);
 }
 
 UniqueDWARFASTTypeMap &SymbolFileDWARFDwo::GetUniqueDWARFASTTypeMap() {
   return GetBaseSymbolFile().GetUniqueDWARFASTTypeMap();
 }
 
-lldb::TypeSP SymbolFileDWARFDwo::FindDefinitionTypeForDWARFDeclContext(
-    const DWARFDeclContext &die_decl_ctx) {
-  return GetBaseSymbolFile().FindDefinitionTypeForDWARFDeclContext(
-      die_decl_ctx);
+lldb::TypeSP
+SymbolFileDWARFDwo::FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die) {
+  return GetBaseSymbolFile().FindDefinitionTypeForDWARFDeclContext(die);
 }
 
 lldb::TypeSP SymbolFileDWARFDwo::FindCompleteObjCDefinitionTypeForDIE(
     const DWARFDIE &die, lldb_private::ConstString type_name,
     bool must_be_implementation) {
   return GetBaseSymbolFile().FindCompleteObjCDefinitionTypeForDIE(
       die, type_name, must_be_implementation);
 }