Author: Michael Buch Date: 2025-06-22T11:41:48+01:00 New Revision: d2c0451d05d95c98727d2447abd1cb4bfed90890
URL: https://github.com/llvm/llvm-project/commit/d2c0451d05d95c98727d2447abd1cb4bfed90890 DIFF: https://github.com/llvm/llvm-project/commit/d2c0451d05d95c98727d2447abd1cb4bfed90890.diff LOG: [lldb][DWAFASTParserClang][NFC] Rename GetCXXObjectParameter to GetObjectParameter Since this is used for Objective-C too. Added: Modified: lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp index 4f79c8aa3f811..a4cb608edd8b4 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp @@ -159,13 +159,9 @@ static bool TagIsRecordType(dw_tag_t tag) { } } -/// Get the object parameter DIE if one exists, otherwise returns -/// a default DWARFDIE. If \c containing_decl_ctx is not a valid -/// C++ declaration context for class methods, assume no object -/// parameter exists for the given \c subprogram. DWARFDIE -DWARFASTParserClang::GetCXXObjectParameter(const DWARFDIE &subprogram, - const DWARFDIE &decl_ctx_die) { +DWARFASTParserClang::GetObjectParameter(const DWARFDIE &subprogram, + const DWARFDIE &decl_ctx_die) { assert(subprogram); assert(subprogram.Tag() == DW_TAG_subprogram || subprogram.Tag() == DW_TAG_inlined_subroutine || @@ -1305,7 +1301,7 @@ DWARFASTParserClang::ParseSubroutine(const DWARFDIE &die, clang::CallingConv calling_convention = ConvertDWARFCallingConventionToClang(attrs); - const DWARFDIE object_parameter = GetCXXObjectParameter(die, decl_ctx_die); + const DWARFDIE object_parameter = GetObjectParameter(die, decl_ctx_die); // clang_type will get the function prototype clang type after this // call @@ -2417,7 +2413,7 @@ DWARFASTParserClang::ConstructDemangledNameFromDWARF(const DWARFDIE &die) { assert(containing_decl_ctx); const unsigned cv_quals = - GetCXXMethodCVQuals(die, GetCXXObjectParameter(die, decl_ctx_die)); + GetCXXMethodCVQuals(die, GetObjectParameter(die, decl_ctx_die)); ParseChildParameters(containing_decl_ctx, die, is_variadic, has_template_params, param_types, param_names); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h index 111604ce4068a..e57fc503d34c1 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h @@ -112,9 +112,19 @@ class DWARFASTParserClang : public lldb_private::plugin::dwarf::DWARFASTParser { void MapDeclDIEToDefDIE(const lldb_private::plugin::dwarf::DWARFDIE &decl_die, const lldb_private::plugin::dwarf::DWARFDIE &def_die); - lldb_private::plugin::dwarf::DWARFDIE GetCXXObjectParameter( - const lldb_private::plugin::dwarf::DWARFDIE &subprogram, - const lldb_private::plugin::dwarf::DWARFDIE &decl_ctx_die); + /// Get the object parameter DIE if one exists, otherwise returns + /// a default DWARFDIE. + /// + /// \param[in] subprogram DIE of function for which to get the object + /// parameter. \param[in] containing_decl_ctx DIE representing declaration + /// context of \a subprogram. If this DIE isn't a valid declaration context + /// for class methods, assume no object parameter exists. + /// + /// \returns DIE of object parameter if one exists. + /// + lldb_private::plugin::dwarf::DWARFDIE + GetObjectParameter(const lldb_private::plugin::dwarf::DWARFDIE &subprogram, + const lldb_private::plugin::dwarf::DWARFDIE &decl_ctx_die); protected: /// Protected typedefs and members. diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp index 2d4b79fed4a55..f18e938dbc4c9 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp @@ -898,8 +898,7 @@ TEST_F(DWARFASTParserClangTests, TestParseDWARFAttributes_ObjectPointer) { auto param_die = decl_die.GetFirstChild(); ASSERT_TRUE(param_die.IsValid()); - EXPECT_EQ(param_die, - ast_parser.GetCXXObjectParameter(decl_die, context_die)); + EXPECT_EQ(param_die, ast_parser.GetObjectParameter(decl_die, context_die)); } { @@ -912,8 +911,8 @@ TEST_F(DWARFASTParserClangTests, TestParseDWARFAttributes_ObjectPointer) { auto param_die = subprogram_definition.GetFirstChild(); ASSERT_TRUE(param_die.IsValid()); - EXPECT_EQ(param_die, ast_parser.GetCXXObjectParameter(subprogram_definition, - context_die)); + EXPECT_EQ(param_die, ast_parser.GetObjectParameter(subprogram_definition, + context_die)); } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
