Revert "[lldb][DWARFASTParserClang] Correctly resolve imported namespaces during expression evaluation"

This reverts commit 1ba6ec0.

Fails on linux buildbots.

Differential Revision: https://reviews.llvm.org/D143398

Author: Michael137

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

@@ -3304,11 +3304,6 @@ DWARFASTParserClang::GetClangDeclContextForDIE(const DWARFDIE &die) {
       try_parsing_type = false;
       break;
 
-    case DW_TAG_imported_declaration:
-      decl_ctx = ResolveImportedDeclarationDIE(die);
-      try_parsing_type = false;
-      break;
-
     case DW_TAG_lexical_block:
       decl_ctx = GetDeclContextForBlock(die);
       try_parsing_type = false;
@@ -3470,42 +3465,6 @@ DWARFASTParserClang::ResolveNamespaceDIE(const DWARFDIE &die) {
   return nullptr;
 }
 
-clang::NamespaceDecl *
-DWARFASTParserClang::ResolveImportedDeclarationDIE(const DWARFDIE &die) {
-  assert(die && die.Tag() == DW_TAG_imported_declaration);
-
-  // See if we cached a NamespaceDecl for this imported declaration
-  // already
-  auto it = m_die_to_decl_ctx.find(die.GetDIE());
-  if (it != m_die_to_decl_ctx.end())
-    return static_cast<clang::NamespaceDecl *>(it->getSecond());
-
-  clang::NamespaceDecl *namespace_decl = nullptr;
-
-  const DWARFDIE imported_uid =
-      die.GetAttributeValueAsReferenceDIE(DW_AT_import);
-  if (!imported_uid)
-    return nullptr;
-
-  switch (imported_uid.Tag()) {
-  case DW_TAG_imported_declaration:
-    namespace_decl = ResolveImportedDeclarationDIE(imported_uid);
-    break;
-  case DW_TAG_namespace:
-    namespace_decl = ResolveNamespaceDIE(imported_uid);
-    break;
-  default:
-    return nullptr;
-  }
-
-  if (!namespace_decl)
-    return nullptr;
-
-  LinkDeclContextToDIE(namespace_decl, die);
-
-  return namespace_decl;
-}
-
 clang::DeclContext *DWARFASTParserClang::GetClangDeclContextContainingDIE(
     const DWARFDIE &die, DWARFDIE *decl_ctx_die_copy) {
   SymbolFileDWARF *dwarf = die.GetDWARF();

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

@@ -132,17 +132,6 @@ class DWARFASTParserClang : public DWARFASTParser {
 
   clang::NamespaceDecl *ResolveNamespaceDIE(const DWARFDIE &die);
 
-  /// Returns the namespace decl that a DW_TAG_imported_declaration imports.
-  ///
-  /// \param[in] die The import declaration to resolve. If the DIE is not a
-  ///                DW_TAG_imported_declaration the behaviour is undefined.
-  ///
-  /// \returns The decl corresponding to the namespace that the specified
-  ///          'die' imports. If the imported entity is not a namespace
-  ///          or another import declaration, returns nullptr. If an error
-  ///          occurs, returns nullptr.
-  clang::NamespaceDecl *ResolveImportedDeclarationDIE(const DWARFDIE &die);
-
   bool ParseTemplateDIE(const DWARFDIE &die,
                         lldb_private::TypeSystemClang::TemplateParameterInfos
                             &template_param_infos);