Author: Leonard Grey Date: 2026-01-08T14:44:31-05:00 New Revision: 14af55c53acf12edfbe1f79d15d570660aafcecc
URL: https://github.com/llvm/llvm-project/commit/14af55c53acf12edfbe1f79d15d570660aafcecc DIFF: https://github.com/llvm/llvm-project/commit/14af55c53acf12edfbe1f79d15d570660aafcecc.diff LOG: [LLDB][PDB] NFC: Change ToCompilerDecl(Context) signature (#175052) Follow-up to https://github.com/llvm/llvm-project/pull/173111 `ToCompilerDeclContext` and `ToCompilerDecl` take their arguments as references, but all callers are pointers. This changes the signature to take pointers, then addresses the comments at https://github.com/llvm/llvm-project/pull/173111#discussion_r2673140167 Added: Modified: lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp index 610f81c5f50d7..b2bc7a8238f40 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp @@ -164,7 +164,7 @@ static bool IsAnonymousNamespaceName(llvm::StringRef name) { PdbAstBuilder::PdbAstBuilder(TypeSystemClang &clang) : m_clang(clang) {} lldb_private::CompilerDeclContext PdbAstBuilder::GetTranslationUnitDecl() { - return ToCompilerDeclContext(*m_clang.GetTranslationUnitDecl()); + return ToCompilerDeclContext(m_clang.GetTranslationUnitDecl()); } std::pair<clang::DeclContext *, std::string> @@ -278,7 +278,7 @@ clang::Decl *PdbAstBuilder::GetOrCreateSymbolForId(PdbCompilandSymId id) { std::optional<CompilerDecl> PdbAstBuilder::GetOrCreateDeclForUid(PdbSymUid uid) { if (clang::Decl *result = TryGetDecl(uid)) - return ToCompilerDecl(*result); + return ToCompilerDecl(result); clang::Decl *result = nullptr; switch (uid.kind()) { @@ -302,7 +302,7 @@ PdbAstBuilder::GetOrCreateDeclForUid(PdbSymUid uid) { if (!result) return std::nullopt; m_uid_to_decl[toOpaqueUid(uid)] = result; - return ToCompilerDecl(*result); + return ToCompilerDecl(result); } clang::DeclContext * @@ -322,7 +322,7 @@ PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid uid) { } CompilerDeclContext PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) { - return m_clang.CreateDeclContext(GetOrCreateClangDeclContextForUid(uid)); + return ToCompilerDeclContext(GetOrCreateClangDeclContextForUid(uid)); } std::pair<clang::DeclContext *, std::string> @@ -426,7 +426,7 @@ clang::DeclContext *PdbAstBuilder::GetParentClangDeclContext(PdbSymUid uid) { } CompilerDeclContext PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { - return m_clang.CreateDeclContext(GetParentClangDeclContext(uid)); + return ToCompilerDeclContext(GetParentClangDeclContext(uid)); } bool PdbAstBuilder::CompleteType(CompilerType ct) { @@ -755,7 +755,7 @@ PdbAstBuilder::GetOrCreateTypedefDecl(PdbGlobalSymId id) { std::string uname = std::string(DropNameScope(udt.Name)); CompilerType ct = ToCompilerType(qt).CreateTypedef( - uname.c_str(), ToCompilerDeclContext(*scope), 0); + uname.c_str(), ToCompilerDeclContext(scope), 0); clang::TypedefNameDecl *tnd = m_clang.GetAsTypedefDecl(ct); DeclStatus status; status.resolved = true; @@ -1461,8 +1461,8 @@ void PdbAstBuilder::ParseDeclsForContext(CompilerDeclContext context) { } } -CompilerDecl PdbAstBuilder::ToCompilerDecl(clang::Decl &decl) { - return m_clang.GetCompilerDecl(&decl); +CompilerDecl PdbAstBuilder::ToCompilerDecl(clang::Decl *decl) { + return m_clang.GetCompilerDecl(decl); } CompilerType PdbAstBuilder::ToCompilerType(clang::QualType qt) { @@ -1474,8 +1474,8 @@ clang::QualType PdbAstBuilder::FromCompilerType(CompilerType ct) { } CompilerDeclContext -PdbAstBuilder::ToCompilerDeclContext(clang::DeclContext &context) { - return m_clang.CreateDeclContext(&context); +PdbAstBuilder::ToCompilerDeclContext(clang::DeclContext *context) { + return m_clang.CreateDeclContext(context); } clang::Decl * PdbAstBuilder::FromCompilerDecl(CompilerDecl decl) { @@ -1512,11 +1512,11 @@ PdbAstBuilder::FindNamespaceDecl(CompilerDeclContext parent_ctx, for (clang::NamespaceDecl *namespace_decl : *set) if (namespace_decl->getName() == name) - return ToCompilerDeclContext(*namespace_decl); + return ToCompilerDeclContext(namespace_decl); for (clang::NamespaceDecl *namespace_decl : *set) if (namespace_decl->isAnonymousNamespace()) - return FindNamespaceDecl(ToCompilerDeclContext(*namespace_decl), name); + return FindNamespaceDecl(ToCompilerDeclContext(namespace_decl), name); return {}; } diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h index 679c3d08cd7d5..3c0f7c12bcd36 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h @@ -81,9 +81,9 @@ class PdbAstBuilder { bool CompleteTagDecl(clang::TagDecl &tag); bool CompleteType(CompilerType ct); - CompilerDecl ToCompilerDecl(clang::Decl &decl); + CompilerDecl ToCompilerDecl(clang::Decl *decl); CompilerType ToCompilerType(clang::QualType qt); - CompilerDeclContext ToCompilerDeclContext(clang::DeclContext &context); + CompilerDeclContext ToCompilerDeclContext(clang::DeclContext *context); clang::QualType FromCompilerType(CompilerType ct); clang::Decl *FromCompilerDecl(CompilerDecl decl); clang::DeclContext *FromCompilerDeclContext(CompilerDeclContext context); diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp index b2feec0f2ee56..d6f8902b7e663 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp @@ -253,7 +253,7 @@ Error UdtRecordCompleter::visitKnownMember(CVMemberRecord &cvr, return Error::success(); std::string name = nested.Name.str(); - ct.CreateTypedef(name.c_str(), m_ast_builder.ToCompilerDeclContext(*decl_ctx), + ct.CreateTypedef(name.c_str(), m_ast_builder.ToCompilerDeclContext(decl_ctx), 0); return Error::success(); } _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
