https://github.com/speednoisemovement updated https://github.com/llvm/llvm-project/pull/173111
>From 348b0ec7773cc88c38f28319093b197d93c7f6c7 Mon Sep 17 00:00:00 2001 From: Leonard Grey <[email protected]> Date: Tue, 16 Dec 2025 16:27:49 -0500 Subject: [PATCH 1/3] [LLDB][NativePDB] NFC: Add language-independent interface methods for PdbAstParser --- .../SymbolFile/NativePDB/PdbAstBuilder.cpp | 121 +++++++++++------- .../SymbolFile/NativePDB/PdbAstBuilder.h | 18 ++- .../NativePDB/SymbolFileNativePDB.cpp | 39 ++---- .../NativePDB/UdtRecordCompleter.cpp | 10 +- 4 files changed, 99 insertions(+), 89 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp index e7fddf08967fb..3da62234d5f97 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp @@ -220,7 +220,7 @@ PdbAstBuilder::CreateDeclInfoForType(const TagRecord &record, TypeIndex ti) { // recurse into our lazy type creation / AST reconstruction logic to get an // LLDB TypeSP for the parent. This will cause the AST to automatically get // the right DeclContext created for any parent. - clang::QualType parent_qt = GetOrCreateType(*parent_index); + clang::QualType parent_qt = GetOrCreateClangType(*parent_index); if (parent_qt.isNull()) return {nullptr, ""}; @@ -247,7 +247,7 @@ clang::Decl *PdbAstBuilder::GetOrCreateSymbolForId(PdbCompilandSymId id) { CVSymbol cvs = index.ReadSymbolRecord(id); if (isLocalVariableType(cvs.kind())) { - clang::DeclContext *scope = GetParentDeclContext(id); + clang::DeclContext *scope = GetParentClangDeclContext(id); if (!scope) return nullptr; clang::Decl *scope_decl = clang::Decl::castFromDeclContext(scope); @@ -286,7 +286,7 @@ PdbAstBuilder::GetOrCreateDeclForUid(PdbSymUid uid) { result = GetOrCreateSymbolForId(uid.asCompilandSym()); break; case PdbSymUidKind::Type: { - clang::QualType qt = GetOrCreateType(uid.asTypeSym()); + clang::QualType qt = GetOrCreateClangType(uid.asTypeSym()); if (qt.isNull()) return std::nullopt; if (auto *tag = qt->getAsTagDecl()) { @@ -305,7 +305,7 @@ PdbAstBuilder::GetOrCreateDeclForUid(PdbSymUid uid) { return ToCompilerDecl(*result); } -clang::DeclContext *PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) { +clang::DeclContext *PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid uid) { if (uid.kind() == PdbSymUidKind::CompilandSym) { if (uid.asCompilandSym().offset == 0) return FromCompilerDeclContext(GetTranslationUnitDecl()); @@ -320,6 +320,13 @@ clang::DeclContext *PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) { return clang::Decl::castToDeclContext(decl); } +CompilerDeclContext PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) { + clang::DeclContext *context = GetOrCreateClangDeclContextForUid(uid); + if (!context) + return {}; + return ToCompilerDeclContext(*context); +} + std::pair<clang::DeclContext *, std::string> PdbAstBuilder::CreateDeclInfoForUndecoratedName(llvm::StringRef name) { SymbolFileNativePDB *pdb = static_cast<SymbolFileNativePDB *>( @@ -340,7 +347,7 @@ PdbAstBuilder::CreateDeclInfoForUndecoratedName(llvm::StringRef name) { // It might be a class name, try that first. std::vector<TypeIndex> types = index.tpi().findRecordsByName(scope_name); while (!types.empty()) { - clang::QualType qt = GetOrCreateType(types.back()); + clang::QualType qt = GetOrCreateClangType(types.back()); if (qt.isNull()) continue; clang::TagDecl *tag = qt->getAsTagDecl(); @@ -357,7 +364,7 @@ PdbAstBuilder::CreateDeclInfoForUndecoratedName(llvm::StringRef name) { return {context, std::string(uname)}; } -clang::DeclContext *PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { +clang::DeclContext *PdbAstBuilder::GetParentClangDeclContext(PdbSymUid uid) { // We must do this *without* calling GetOrCreate on the current uid, as // that would be an infinite recursion. SymbolFileNativePDB *pdb = static_cast<SymbolFileNativePDB *>( @@ -368,7 +375,7 @@ clang::DeclContext *PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { std::optional<PdbCompilandSymId> scope = pdb->FindSymbolScope(uid.asCompilandSym()); if (scope) - return GetOrCreateDeclContextForUid(*scope); + return GetOrCreateClangDeclContextForUid(*scope); CVSymbol sym = index.ReadSymbolRecord(uid.asCompilandSym()); return CreateDeclInfoForUndecoratedName(getSymbolName(sym)).first; @@ -380,7 +387,7 @@ clang::DeclContext *PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { std::optional<TypeIndex> parent_index = pdb->GetParentType(type_id.index); if (!parent_index) return FromCompilerDeclContext(GetTranslationUnitDecl()); - return GetOrCreateDeclContextForUid(PdbTypeSymId(*parent_index)); + return GetOrCreateClangDeclContextForUid(PdbTypeSymId(*parent_index)); } case PdbSymUidKind::FieldListMember: // In this case the parent DeclContext is the one for the class that this @@ -404,7 +411,7 @@ clang::DeclContext *PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { llvm::cantFail( SymbolDeserializer::deserializeAs<ProcRefSym>(global, ref)); PdbCompilandSymId cu_sym_id{ref.modi(), ref.SymOffset}; - return GetParentDeclContext(cu_sym_id); + return GetParentClangDeclContext(cu_sym_id); } case SymbolKind::S_CONSTANT: case SymbolKind::S_UDT: @@ -420,7 +427,16 @@ clang::DeclContext *PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { return FromCompilerDeclContext(GetTranslationUnitDecl()); } -bool PdbAstBuilder::CompleteType(clang::QualType qt) { +CompilerDeclContext PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { + clang::DeclContext *context = GetParentClangDeclContext(uid); + if (!context) + return {}; + return ToCompilerDeclContext(*context); +} + +bool PdbAstBuilder::CompleteType(CompilerType ct) { + clang::QualType qt = + clang::QualType::getFromOpaquePtr(ct.GetOpaqueQualType()); if (qt.isNull()) return false; clang::TagDecl *tag = qt->getAsTagDecl(); @@ -499,7 +515,7 @@ clang::QualType PdbAstBuilder::CreateSimpleType(TypeIndex ti) { return GetBasicType(lldb::eBasicTypeNullPtr); if (ti.getSimpleMode() != SimpleTypeMode::Direct) { - clang::QualType direct_type = GetOrCreateType(ti.makeDirect()); + clang::QualType direct_type = GetOrCreateClangType(ti.makeDirect()); if (direct_type.isNull()) return {}; return m_clang.getASTContext().getPointerType(direct_type); @@ -516,7 +532,7 @@ clang::QualType PdbAstBuilder::CreateSimpleType(TypeIndex ti) { } clang::QualType PdbAstBuilder::CreatePointerType(const PointerRecord &pointer) { - clang::QualType pointee_type = GetOrCreateType(pointer.ReferentType); + clang::QualType pointee_type = GetOrCreateClangType(pointer.ReferentType); // This can happen for pointers to LF_VTSHAPE records, which we shouldn't // create in the AST. @@ -525,7 +541,7 @@ clang::QualType PdbAstBuilder::CreatePointerType(const PointerRecord &pointer) { if (pointer.isPointerToMember()) { MemberPointerInfo mpi = pointer.getMemberInfo(); - clang::QualType class_type = GetOrCreateType(mpi.ContainingType); + clang::QualType class_type = GetOrCreateClangType(mpi.ContainingType); if (class_type.isNull()) return {}; if (clang::TagDecl *tag = class_type->getAsTagDecl()) { @@ -589,7 +605,7 @@ clang::QualType PdbAstBuilder::CreatePointerType(const PointerRecord &pointer) { clang::QualType PdbAstBuilder::CreateModifierType(const ModifierRecord &modifier) { - clang::QualType unmodified_type = GetOrCreateType(modifier.ModifiedType); + clang::QualType unmodified_type = GetOrCreateClangType(modifier.ModifiedType); if (unmodified_type.isNull()) return {}; @@ -659,7 +675,7 @@ PdbAstBuilder::GetOrCreateBlockDecl(PdbCompilandSymId block_id) { if (clang::Decl *decl = TryGetDecl(block_id)) return llvm::dyn_cast<clang::BlockDecl>(decl); - clang::DeclContext *scope = GetParentDeclContext(block_id); + clang::DeclContext *scope = GetParentClangDeclContext(block_id); clang::BlockDecl *block_decl = m_clang.CreateBlockDeclaration(scope, OptionalClangModuleID()); @@ -676,7 +692,7 @@ PdbAstBuilder::GetOrCreateBlockDecl(PdbCompilandSymId block_id) { clang::VarDecl *PdbAstBuilder::CreateVariableDecl(PdbSymUid uid, CVSymbol sym, clang::DeclContext &scope) { VariableInfo var_info = GetVariableNameInfo(sym); - clang::QualType qt = GetOrCreateType(var_info.type); + clang::QualType qt = GetOrCreateClangType(var_info.type); if (qt.isNull()) return nullptr; @@ -697,7 +713,7 @@ PdbAstBuilder::GetOrCreateVariableDecl(PdbCompilandSymId scope_id, if (clang::Decl *decl = TryGetDecl(var_id)) return llvm::dyn_cast<clang::VarDecl>(decl); - clang::DeclContext *scope = GetOrCreateDeclContextForUid(scope_id); + clang::DeclContext *scope = GetOrCreateClangDeclContextForUid(scope_id); if (!scope) return nullptr; @@ -732,10 +748,10 @@ PdbAstBuilder::GetOrCreateTypedefDecl(PdbGlobalSymId id) { lldbassert(sym.kind() == S_UDT); UDTSym udt = llvm::cantFail(SymbolDeserializer::deserializeAs<UDTSym>(sym)); - clang::DeclContext *scope = GetParentDeclContext(id); + clang::DeclContext *scope = GetParentClangDeclContext(id); PdbTypeSymId real_type_id{udt.Type, false}; - clang::QualType qt = GetOrCreateType(real_type_id); + clang::QualType qt = GetOrCreateClangType(real_type_id); if (qt.isNull() || !scope) return nullptr; @@ -810,7 +826,7 @@ clang::QualType PdbAstBuilder::CreateType(PdbTypeSymId type) { return {}; } -clang::QualType PdbAstBuilder::GetOrCreateType(PdbTypeSymId type) { +clang::QualType PdbAstBuilder::GetOrCreateClangType(PdbTypeSymId type) { if (type.index.isNoneType()) return {}; @@ -828,7 +844,7 @@ clang::QualType PdbAstBuilder::GetOrCreateType(PdbTypeSymId type) { if (best_type.index != type.index) { // This is a forward decl. Call GetOrCreate on the full decl, then map the // forward decl id to the full decl QualType. - clang::QualType qt = GetOrCreateType(best_type); + clang::QualType qt = GetOrCreateClangType(best_type); if (qt.isNull()) return {}; m_uid_to_type[toOpaqueUid(type)] = qt; @@ -853,6 +869,13 @@ clang::QualType PdbAstBuilder::GetOrCreateType(PdbTypeSymId type) { return qt; } +CompilerType PdbAstBuilder::GetOrCreateType(PdbTypeSymId type) { + clang::QualType qt = GetOrCreateClangType(type); + if (qt.isNull()) + return {}; + return ToCompilerType(qt); +} + clang::FunctionDecl * PdbAstBuilder::CreateFunctionDecl(PdbCompilandSymId func_id, llvm::StringRef func_name, TypeIndex func_ti, @@ -986,7 +1009,7 @@ PdbAstBuilder::CreateFunctionDeclFromId(PdbTypeSymId func_tid, func_name = mfr.getName(); func_ti = mfr.getFunctionType(); PdbTypeSymId class_type_id(mfr.ClassType, false); - parent = GetOrCreateDeclContextForUid(class_type_id); + parent = GetOrCreateClangDeclContextForUid(class_type_id); break; } case LF_FUNC_ID: { @@ -1009,7 +1032,7 @@ PdbAstBuilder::CreateFunctionDeclFromId(PdbTypeSymId func_tid, default: lldbassert(false && "Invalid function id type!"); } - clang::QualType func_qt = GetOrCreateType(func_ti); + clang::QualType func_qt = GetOrCreateClangType(func_ti); if (func_qt.isNull() || !parent) return nullptr; CompilerType func_ct = ToCompilerType(func_qt); @@ -1024,7 +1047,7 @@ PdbAstBuilder::GetOrCreateFunctionDecl(PdbCompilandSymId func_id) { if (clang::Decl *decl = TryGetDecl(func_id)) return llvm::dyn_cast<clang::FunctionDecl>(decl); - clang::DeclContext *parent = GetParentDeclContext(PdbSymUid(func_id)); + clang::DeclContext *parent = GetParentClangDeclContext(PdbSymUid(func_id)); if (!parent) return nullptr; std::string context_name; @@ -1042,7 +1065,7 @@ PdbAstBuilder::GetOrCreateFunctionDecl(PdbCompilandSymId func_id) { llvm::cantFail(SymbolDeserializer::deserializeAs<ProcSym>(cvs, proc)); PdbTypeSymId type_id(proc.FunctionType); - clang::QualType qt = GetOrCreateType(type_id); + clang::QualType qt = GetOrCreateClangType(type_id); if (qt.isNull()) return nullptr; @@ -1130,7 +1153,7 @@ void PdbAstBuilder::CreateFunctionParameters(PdbCompilandSymId func_id, } PdbCompilandSymId param_uid(func_id.modi, record_offset); - clang::QualType qt = GetOrCreateType(param_type); + clang::QualType qt = GetOrCreateClangType(param_type); if (qt.isNull()) return; @@ -1157,7 +1180,7 @@ clang::QualType PdbAstBuilder::CreateEnumType(PdbTypeSymId id, if (!decl_context) return {}; - clang::QualType underlying_type = GetOrCreateType(er.UnderlyingType); + clang::QualType underlying_type = GetOrCreateClangType(er.UnderlyingType); if (underlying_type.isNull()) return {}; @@ -1173,7 +1196,7 @@ clang::QualType PdbAstBuilder::CreateEnumType(PdbTypeSymId id, } clang::QualType PdbAstBuilder::CreateArrayType(const ArrayRecord &ar) { - clang::QualType element_type = GetOrCreateType(ar.ElementType); + clang::QualType element_type = GetOrCreateClangType(ar.ElementType); TypeSystemClang::RequireCompleteType(ToCompilerType(element_type)); SymbolFileNativePDB *pdb = static_cast<SymbolFileNativePDB *>( @@ -1210,13 +1233,13 @@ clang::QualType PdbAstBuilder::CreateFunctionType( arg_types.reserve(arg_indices.size()); for (TypeIndex arg_index : arg_indices) { - clang::QualType arg_type = GetOrCreateType(arg_index); + clang::QualType arg_type = GetOrCreateClangType(arg_index); if (arg_type.isNull()) continue; arg_types.push_back(ToCompilerType(arg_type)); } - clang::QualType return_type = GetOrCreateType(return_type_idx); + clang::QualType return_type = GetOrCreateClangType(return_type_idx); if (return_type.isNull()) return {}; @@ -1277,7 +1300,7 @@ void PdbAstBuilder::ParseNamespace(clang::DeclContext &context) { if (ns_name.starts_with(qname)) { ns_name = ns_name.drop_front(qname.size()); if (ns_name.starts_with("::")) - GetOrCreateType(tid); + GetOrCreateClangType(tid); } } ParseAllFunctionsAndNonLocalVars(); @@ -1297,7 +1320,7 @@ void PdbAstBuilder::ParseAllTypes() { if (!IsTagRecord(cvt)) continue; - GetOrCreateType(tid); + GetOrCreateClangType(tid); } }); } @@ -1413,26 +1436,30 @@ void PdbAstBuilder::ParseDeclsForSimpleContext(clang::DeclContext &context) { } } -void PdbAstBuilder::ParseDeclsForContext(clang::DeclContext &context) { +void PdbAstBuilder::ParseDeclsForContext(CompilerDeclContext context) { + clang::DeclContext *dc = FromCompilerDeclContext(context); + if (!dc) + return; + // Namespaces aren't explicitly represented in the debug info, and the only // way to parse them is to parse all type info, demangling every single type // and trying to reconstruct the DeclContext hierarchy this way. Since this // is an expensive operation, we have to special case it so that we do other // work (such as parsing the items that appear within the namespaces) at the // same time. - if (context.isTranslationUnit()) { + if (dc->isTranslationUnit()) { ParseAllTypes(); ParseAllFunctionsAndNonLocalVars(); return; } - if (context.isNamespace()) { - ParseNamespace(context); + if (dc->isNamespace()) { + ParseNamespace(*dc); return; } - if (isTagDecl(context) || isFunctionDecl(context) || isBlockDecl(context)) { - ParseDeclsForSimpleContext(context); + if (isTagDecl(*dc) || isFunctionDecl(*dc) || isBlockDecl(*dc)) { + ParseDeclsForSimpleContext(*dc); return; } } @@ -1464,14 +1491,16 @@ void PdbAstBuilder::Dump(Stream &stream, llvm::StringRef filter, m_clang.Dump(stream.AsRawOstream(), filter, show_color); } -clang::NamespaceDecl * -PdbAstBuilder::FindNamespaceDecl(const clang::DeclContext *parent, - llvm::StringRef name) { - NamespaceSet *set; +CompilerDeclContext +PdbAstBuilder::FindNamespaceDecl(CompilerDeclContext parent_ctx, + llvm::StringRef name) { + clang::DeclContext *parent = FromCompilerDeclContext(parent_ctx); + NamespaceSet *set; + if (parent) { auto it = m_parent_to_namespaces.find(parent); if (it == m_parent_to_namespaces.end()) - return nullptr; + return {}; set = &it->second; } else { @@ -1482,11 +1511,11 @@ PdbAstBuilder::FindNamespaceDecl(const clang::DeclContext *parent, for (clang::NamespaceDecl *namespace_decl : *set) if (namespace_decl->getName() == name) - return namespace_decl; + return ToCompilerDeclContext(*namespace_decl); for (clang::NamespaceDecl *namespace_decl : *set) if (namespace_decl->isAnonymousNamespace()) - return FindNamespaceDecl(namespace_decl, name); + return FindNamespaceDecl(ToCompilerDeclContext(*namespace_decl), name); - return nullptr; + return {}; } diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h index 16247fcf88b12..40acd5f11cdbf 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.h @@ -59,8 +59,10 @@ class PdbAstBuilder { std::optional<lldb_private::CompilerDecl> GetOrCreateDeclForUid(PdbSymUid uid); - clang::DeclContext *GetOrCreateDeclContextForUid(PdbSymUid uid); - clang::DeclContext *GetParentDeclContext(PdbSymUid uid); + lldb_private::CompilerDeclContext GetOrCreateDeclContextForUid(PdbSymUid uid); + clang::DeclContext *GetOrCreateClangDeclContextForUid(PdbSymUid uid); + lldb_private::CompilerDeclContext GetParentDeclContext(PdbSymUid uid); + clang::DeclContext *GetParentClangDeclContext(PdbSymUid uid); clang::FunctionDecl *GetOrCreateFunctionDecl(PdbCompilandSymId func_id); clang::FunctionDecl * @@ -70,13 +72,14 @@ class PdbAstBuilder { PdbCompilandSymId var_id); clang::VarDecl *GetOrCreateVariableDecl(PdbGlobalSymId var_id); clang::TypedefNameDecl *GetOrCreateTypedefDecl(PdbGlobalSymId id); - void ParseDeclsForContext(clang::DeclContext &context); + void ParseDeclsForContext(lldb_private::CompilerDeclContext context); clang::QualType GetBasicType(lldb::BasicType type); - clang::QualType GetOrCreateType(PdbTypeSymId type); + clang::QualType GetOrCreateClangType(PdbTypeSymId type); + CompilerType GetOrCreateType(PdbTypeSymId type); bool CompleteTagDecl(clang::TagDecl &tag); - bool CompleteType(clang::QualType qt); + bool CompleteType(CompilerType ct); CompilerDecl ToCompilerDecl(clang::Decl &decl); CompilerType ToCompilerType(clang::QualType qt); @@ -89,8 +92,9 @@ class PdbAstBuilder { void Dump(Stream &stream, llvm::StringRef filter, bool show_color); - clang::NamespaceDecl *FindNamespaceDecl(const clang::DeclContext *parent, - llvm::StringRef name); + lldb_private::CompilerDeclContext + FindNamespaceDecl(lldb_private::CompilerDeclContext parent_ctx, + llvm::StringRef name); private: clang::Decl *TryGetDecl(PdbSymUid uid) const; diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp index 3bf113a07d28c..82a789716a425 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp @@ -923,11 +923,11 @@ TypeSP SymbolFileNativePDB::CreateAndCacheType(PdbTypeSymId type_id) { return nullptr; PdbAstBuilder* ast_builder = ts->GetNativePDBParser(); - clang::QualType qt = ast_builder->GetOrCreateType(best_decl_id); - if (qt.isNull()) + CompilerType ct = ast_builder->GetOrCreateType(best_decl_id); + if (!ct) return nullptr; - TypeSP result = CreateType(best_decl_id, ast_builder->ToCompilerType(qt)); + TypeSP result = CreateType(best_decl_id, ct); if (!result) return nullptr; @@ -1127,10 +1127,7 @@ void SymbolFileNativePDB::ParseDeclsForContext( if (!ts_or_err) return; PdbAstBuilder* ast_builder = ts_or_err->GetNativePDBParser(); - clang::DeclContext *context = ast_builder->FromCompilerDeclContext(decl_ctx); - if (!context) - return; - ast_builder->ParseDeclsForContext(*context); + ast_builder->ParseDeclsForContext(decl_ctx); } lldb::CompUnitSP SymbolFileNativePDB::ParseCompileUnitAtIndex(uint32_t index) { @@ -2446,12 +2443,7 @@ SymbolFileNativePDB::GetDeclContextForUID(lldb::user_id_t uid) { return {}; PdbAstBuilder *ast_builder = ts->GetNativePDBParser(); - clang::DeclContext *context = - ast_builder->GetOrCreateDeclContextForUid(PdbSymUid(uid)); - if (!context) - return {}; - - return ast_builder->ToCompilerDeclContext(*context); + return ast_builder->GetOrCreateDeclContextForUid(PdbSymUid(uid)); } CompilerDeclContext @@ -2464,10 +2456,7 @@ SymbolFileNativePDB::GetDeclContextContainingUID(lldb::user_id_t uid) { return {}; PdbAstBuilder *ast_builder = ts->GetNativePDBParser(); - clang::DeclContext *context = ast_builder->GetParentDeclContext(PdbSymUid(uid)); - if (!context) - return CompilerDeclContext(); - return ast_builder->ToCompilerDeclContext(*context); + return ast_builder->GetParentDeclContext(PdbSymUid(uid)); } Type *SymbolFileNativePDB::ResolveTypeUID(lldb::user_id_t type_uid) { @@ -2510,10 +2499,8 @@ bool SymbolFileNativePDB::CompleteType(CompilerType &compiler_type) { if (ast_builder && ast_builder->GetClangASTImporter().CanImport(compiler_type)) return ast_builder->GetClangASTImporter().CompleteType(compiler_type); - clang::QualType qt = - clang::QualType::getFromOpaquePtr(compiler_type.GetOpaqueQualType()); - return ast_builder->CompleteType(qt); + return ast_builder->CompleteType(compiler_type); } void SymbolFileNativePDB::GetTypes(lldb_private::SymbolContextScope *sc_scope, @@ -2539,17 +2526,7 @@ SymbolFileNativePDB::FindNamespace(ConstString name, if (!ast_builder) return {}; - clang::DeclContext *decl_context = nullptr; - if (parent_decl_ctx) - decl_context = static_cast<clang::DeclContext *>( - parent_decl_ctx.GetOpaqueDeclContext()); - - auto *namespace_decl = - ast_builder->FindNamespaceDecl(decl_context, name.GetStringRef()); - if (!namespace_decl) - return CompilerDeclContext(); - - return clang->CreateDeclContext(namespace_decl); + return ast_builder->FindNamespaceDecl(parent_decl_ctx, name.GetStringRef()); } llvm::Expected<lldb::TypeSystemSP> diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp index f3d6fbf1e27d8..f3bea53112093 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp @@ -64,7 +64,7 @@ clang::QualType UdtRecordCompleter::AddBaseClassForTypeIndex( llvm::codeview::TypeIndex ti, llvm::codeview::MemberAccess access, std::optional<uint64_t> vtable_idx) { PdbTypeSymId type_id(ti); - clang::QualType qt = m_ast_builder.GetOrCreateType(type_id); + clang::QualType qt = m_ast_builder.GetOrCreateClangType(type_id); CVType udt_cvt = m_index.tpi().getType(ti); @@ -85,7 +85,7 @@ void UdtRecordCompleter::AddMethod(llvm::StringRef name, TypeIndex type_idx, MemberAccess access, MethodOptions options, MemberAttributes attrs) { clang::QualType method_qt = - m_ast_builder.GetOrCreateType(PdbTypeSymId(type_idx)); + m_ast_builder.GetOrCreateClangType(PdbTypeSymId(type_idx)); if (method_qt.isNull()) return; CompilerType method_ct = m_ast_builder.ToCompilerType(method_qt); @@ -146,7 +146,7 @@ Error UdtRecordCompleter::visitKnownMember(CVMemberRecord &cvr, Error UdtRecordCompleter::visitKnownMember( CVMemberRecord &cvr, StaticDataMemberRecord &static_data_member) { clang::QualType member_type = - m_ast_builder.GetOrCreateType(PdbTypeSymId(static_data_member.Type)); + m_ast_builder.GetOrCreateClangType(PdbTypeSymId(static_data_member.Type)); if (member_type.isNull()) return llvm::Error::success(); @@ -276,7 +276,7 @@ Error UdtRecordCompleter::visitKnownMember(CVMemberRecord &cvr, } } - clang::QualType member_qt = m_ast_builder.GetOrCreateType(PdbTypeSymId(ti)); + clang::QualType member_qt = m_ast_builder.GetOrCreateClangType(PdbTypeSymId(ti)); if (member_qt.isNull()) return Error::success(); TypeSystemClang::RequireCompleteType(m_ast_builder.ToCompilerType(member_qt)); @@ -425,7 +425,7 @@ UdtRecordCompleter::AddMember(TypeSystemClang &clang, Member *field, void UdtRecordCompleter::FinishRecord() { TypeSystemClang &clang = m_ast_builder.clang(); clang::DeclContext *decl_ctx = - m_ast_builder.GetOrCreateDeclContextForUid(m_id); + m_ast_builder.GetOrCreateClangDeclContextForUid(m_id); m_record.ConstructRecord(); // Maybe we should check the construsted record size with the size in pdb. If // they mismatch, it might be pdb has fields info missing. >From 649800e0da37ffdb7c5b9e5fb5878b6779cda334 Mon Sep 17 00:00:00 2001 From: Leonard Grey <[email protected]> Date: Fri, 19 Dec 2025 14:37:27 -0500 Subject: [PATCH 2/3] Make some wrappers more concise --- .../Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp index 3da62234d5f97..73a2209a36984 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp @@ -321,10 +321,7 @@ clang::DeclContext *PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid u } CompilerDeclContext PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) { - clang::DeclContext *context = GetOrCreateClangDeclContextForUid(uid); - if (!context) - return {}; - return ToCompilerDeclContext(*context); + return m_clang.CreateDeclContext(GetOrCreateClangDeclContextForUid(uid)); } std::pair<clang::DeclContext *, std::string> @@ -428,10 +425,7 @@ clang::DeclContext *PdbAstBuilder::GetParentClangDeclContext(PdbSymUid uid) { } CompilerDeclContext PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) { - clang::DeclContext *context = GetParentClangDeclContext(uid); - if (!context) - return {}; - return ToCompilerDeclContext(*context); + return m_clang.CreateDeclContext(GetParentClangDeclContext(uid)); } bool PdbAstBuilder::CompleteType(CompilerType ct) { >From 41cb03f6b259ef7931b16115cd212a827da861bd Mon Sep 17 00:00:00 2001 From: Leonard Grey <[email protected]> Date: Fri, 19 Dec 2025 17:52:57 -0500 Subject: [PATCH 3/3] Format --- .../Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp | 9 +++++---- .../Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp index 73a2209a36984..846854c0cfe0b 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp @@ -305,7 +305,8 @@ PdbAstBuilder::GetOrCreateDeclForUid(PdbSymUid uid) { return ToCompilerDecl(*result); } -clang::DeclContext *PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid uid) { +clang::DeclContext * +PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid uid) { if (uid.kind() == PdbSymUidKind::CompilandSym) { if (uid.asCompilandSym().offset == 0) return FromCompilerDeclContext(GetTranslationUnitDecl()); @@ -1487,9 +1488,9 @@ void PdbAstBuilder::Dump(Stream &stream, llvm::StringRef filter, CompilerDeclContext PdbAstBuilder::FindNamespaceDecl(CompilerDeclContext parent_ctx, - llvm::StringRef name) { - clang::DeclContext *parent = FromCompilerDeclContext(parent_ctx); - NamespaceSet *set; + llvm::StringRef name) { + clang::DeclContext *parent = FromCompilerDeclContext(parent_ctx); + NamespaceSet *set; if (parent) { auto it = m_parent_to_namespaces.find(parent); diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp index f3bea53112093..26a75a02a3a4f 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp @@ -276,7 +276,8 @@ Error UdtRecordCompleter::visitKnownMember(CVMemberRecord &cvr, } } - clang::QualType member_qt = m_ast_builder.GetOrCreateClangType(PdbTypeSymId(ti)); + clang::QualType member_qt = + m_ast_builder.GetOrCreateClangType(PdbTypeSymId(ti)); if (member_qt.isNull()) return Error::success(); TypeSystemClang::RequireCompleteType(m_ast_builder.ToCompilerType(member_qt)); _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
