aeubanks created this revision.
Herald added a reviewer: shafik.
Herald added a project: All.
aeubanks requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
In D134378 <https://reviews.llvm.org/D134378>, we'll need the clang AST to be
able to construct the qualified in some cases.
This makes logging in one place slightly less informative.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D135979
Files:
lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h
lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -2960,8 +2960,6 @@
if (!try_resolving_type) {
if (log) {
- std::string qualified_name;
- type_die.GetQualifiedName(qualified_name);
GetObjectFile()->GetModule()->LogMessage(
log,
"SymbolFileDWARF::"
@@ -2969,7 +2967,7 @@
"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(),
- qualified_name.c_str());
+ type_die.GetName());
}
return true;
}
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
@@ -99,11 +99,6 @@
const char *GetPubname(const DWARFUnit *cu) const;
- const char *GetQualifiedName(DWARFUnit *cu, std::string &storage) const;
-
- const char *GetQualifiedName(DWARFUnit *cu, const DWARFAttributes &attributes,
- std::string &storage) const;
-
bool GetDIENamesAndRanges(
DWARFUnit *cu, const char *&name, const char *&mangled,
DWARFRangeList &rangeList, int &decl_file, int &decl_line,
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
@@ -798,66 +798,6 @@
return DWARFDIE();
}
-const char *DWARFDebugInfoEntry::GetQualifiedName(DWARFUnit *cu,
- std::string &storage) const {
- DWARFAttributes attributes;
- GetAttributes(cu, attributes, Recurse::yes);
- return GetQualifiedName(cu, attributes, storage);
-}
-
-const char *
-DWARFDebugInfoEntry::GetQualifiedName(DWARFUnit *cu,
- const DWARFAttributes &attributes,
- std::string &storage) const {
-
- const char *name = GetName(cu);
-
- if (name) {
- DWARFDIE parent_decl_ctx_die = GetParentDeclContextDIE(cu);
- storage.clear();
- // TODO: change this to get the correct decl context parent....
- while (parent_decl_ctx_die) {
- const dw_tag_t parent_tag = parent_decl_ctx_die.Tag();
- switch (parent_tag) {
- case DW_TAG_namespace: {
- const char *namespace_name = parent_decl_ctx_die.GetName();
- if (namespace_name) {
- storage.insert(0, "::");
- storage.insert(0, namespace_name);
- } else {
- storage.insert(0, "(anonymous namespace)::");
- }
- parent_decl_ctx_die = parent_decl_ctx_die.GetParentDeclContextDIE();
- } break;
-
- case DW_TAG_class_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type: {
- const char *class_union_struct_name = parent_decl_ctx_die.GetName();
-
- if (class_union_struct_name) {
- storage.insert(0, "::");
- storage.insert(0, class_union_struct_name);
- }
- parent_decl_ctx_die = parent_decl_ctx_die.GetParentDeclContextDIE();
- } break;
-
- default:
- parent_decl_ctx_die.Clear();
- break;
- }
- }
-
- if (storage.empty())
- storage.append("::");
-
- storage.append(name);
- }
- if (storage.empty())
- return nullptr;
- return storage.c_str();
-}
-
lldb::offset_t DWARFDebugInfoEntry::GetFirstAttributeOffset() const {
return GetOffset() + llvm::getULEB128Size(m_abbr_idx);
}
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h
@@ -30,8 +30,6 @@
const char *GetPubname() const;
- const char *GetQualifiedName(std::string &storage) const;
-
using DWARFBaseDIE::GetName;
void GetName(lldb_private::Stream &s) const;
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
@@ -210,13 +210,6 @@
return nullptr;
}
-const char *DWARFDIE::GetQualifiedName(std::string &storage) const {
- if (IsValid())
- return m_die->GetQualifiedName(m_cu, storage);
- else
- return nullptr;
-}
-
// GetName
//
// Get value of the DW_AT_name attribute and place that value into the supplied
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h
@@ -121,11 +121,18 @@
bool ParseTemplateDIE(const DWARFDIE &die,
lldb_private::TypeSystemClang::TemplateParameterInfos
&template_param_infos);
+
bool ParseTemplateParameterInfos(
const DWARFDIE &parent_die,
lldb_private::TypeSystemClang::TemplateParameterInfos
&template_param_infos);
+ /// Get the template parameters of a die as a string if the die name does not
+ /// already contain them. This happens with -gsimple-template-names.
+ std::string GetTemplateParametersString(const DWARFDIE &die);
+
+ std::string GetCPlusPlusQualifiedName(const DWARFDIE &die);
+
bool ParseChildMembers(
const DWARFDIE &die, lldb_private::CompilerType &class_compiler_type,
std::vector<std::unique_ptr<clang::CXXBaseSpecifier>> &base_classes,
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -1523,6 +1523,95 @@
return type_sp;
}
+std::string
+DWARFASTParserClang::GetTemplateParametersString(const DWARFDIE &die) {
+ if (llvm::StringRef(die.GetName()).contains("<"))
+ return std::string();
+ TypeSystemClang::TemplateParameterInfos template_param_infos;
+ if (ParseTemplateParameterInfos(die, template_param_infos)) {
+ std::string all_template_names;
+ llvm::SmallVector<clang::TemplateArgument, 2> args =
+ template_param_infos.args;
+ if (template_param_infos.hasParameterPack()) {
+ args.append(template_param_infos.packed_args->args);
+ }
+ for (auto &arg : args) {
+ std::string template_name;
+ llvm::raw_string_ostream os(template_name);
+ arg.dump(os);
+ if (!template_name.empty()) {
+ if (all_template_names.empty()) {
+ all_template_names.append("<");
+ } else {
+ all_template_names.append(", ");
+ }
+ all_template_names.append(template_name);
+ }
+ }
+ if (!all_template_names.empty()) {
+ all_template_names.append(">");
+ // does the spacing here matter?
+ }
+ return all_template_names;
+ }
+ return std::string();
+}
+
+std::string
+DWARFASTParserClang::GetCPlusPlusQualifiedName(const DWARFDIE &die) {
+ if (!die.IsValid())
+ return "";
+ const char *name = die.GetName();
+ if (!name)
+ return "";
+ std::string qualified_name;
+ DWARFDIE parent_decl_ctx_die = die.GetParentDeclContextDIE();
+ // TODO: change this to get the correct decl context parent....
+ while (parent_decl_ctx_die) {
+ // The name may not contain template parameters due to simplified template
+ // names; we must reconstruct the full name from child template parameter
+ // dies via GetTemplateParametersString().
+ const dw_tag_t parent_tag = parent_decl_ctx_die.Tag();
+ switch (parent_tag) {
+ case DW_TAG_namespace: {
+ if (const char *namespace_name = parent_decl_ctx_die.GetName()) {
+ qualified_name.insert(0, "::");
+ qualified_name.insert(0, namespace_name);
+ } else {
+ qualified_name.insert(0, "(anonymous namespace)::");
+ }
+ parent_decl_ctx_die = parent_decl_ctx_die.GetParentDeclContextDIE();
+ break;
+ }
+
+ case DW_TAG_class_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type: {
+ if (const char *class_union_struct_name = parent_decl_ctx_die.GetName()) {
+ qualified_name.insert(0,
+ GetTemplateParametersString(parent_decl_ctx_die));
+ qualified_name.insert(0, "::");
+ qualified_name.insert(0, class_union_struct_name);
+ }
+ parent_decl_ctx_die = parent_decl_ctx_die.GetParentDeclContextDIE();
+ break;
+ }
+
+ default:
+ parent_decl_ctx_die.Clear();
+ break;
+ }
+ }
+
+ if (qualified_name.empty())
+ qualified_name.append("::");
+
+ qualified_name.append(name);
+ qualified_name.append(GetTemplateParametersString(die));
+
+ return qualified_name;
+}
+
TypeSP
DWARFASTParserClang::ParseStructureLikeDIE(const SymbolContext &sc,
const DWARFDIE &die,
@@ -1548,9 +1637,7 @@
// For C++, we rely solely upon the one definition rule that says
// only one thing can exist at a given decl context. We ignore the
// file and line that things are declared on.
- std::string qualified_name;
- if (die.GetQualifiedName(qualified_name))
- unique_typename = ConstString(qualified_name);
+ unique_typename = ConstString(GetCPlusPlusQualifiedName(die));
unique_decl.Clear();
}
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
