llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Michael Buch (Michael137) <details> <summary>Changes</summary> In https://github.com/llvm/llvm-project/pull/182956 we stopped using the access specifiers and unconditionally set all access to `AS_public`. This patch is a follow-up cleanup to remove all the `AccessType` parameters of the `TypeSystemClang` APIs. --- Patch is 78.25 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/183023.diff 20 Files Affected: - (modified) lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp (+2-2) - (modified) lldb/source/Plugins/Language/ObjC/NSDictionary.cpp (+6-7) - (modified) lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp (+4-5) - (modified) lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp (+18-29) - (modified) lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp (+22-32) - (modified) lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp (+21-31) - (modified) lldb/source/Plugins/RegisterTypeBuilder/RegisterTypeBuilderClang.cpp (+3-5) - (modified) lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp (+3-3) - (modified) lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp (+23-37) - (modified) lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h (-8) - (modified) lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilderClang.cpp (+6-14) - (modified) lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.cpp (+11-15) - (modified) lldb/source/Plugins/SymbolFile/NativePDB/UdtRecordCompleter.h (-1) - (modified) lldb/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp (+5-41) - (modified) lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp (+5-10) - (modified) lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp (+15-18) - (modified) lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h (+15-16) - (modified) lldb/unittests/Language/CPlusPlus/LibStdcppTupleTest.cpp (+4-6) - (modified) lldb/unittests/Symbol/TestTypeSystemClang.cpp (+63-65) - (modified) lldb/unittests/TestingSupport/Symbol/ClangTestUtils.h (+2-4) ``````````diff diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp index 9f4ccc60c0b34..e7305ec4f3d07 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp @@ -2011,8 +2011,8 @@ void ClangExpressionDeclMap::AddContextClassType(NameSearchContext &context, CXXMethodDecl *method_decl = m_clang_ast_context->AddMethodToCXXRecordType( copied_clang_type.GetOpaqueQualType(), "$__lldb_expr", /*asm_label=*/{}, - method_type, lldb::eAccessPublic, is_virtual, is_static, is_inline, - is_explicit, is_attr_used, is_artificial); + method_type, is_virtual, is_static, is_inline, is_explicit, + is_attr_used, is_artificial); LLDB_LOG(log, " CEDM::AddThisType Added function $__lldb_expr " diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp index 24e84899e683c..4ff8f36adff88 100644 --- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp @@ -78,18 +78,17 @@ static CompilerType GetLLDBNSPairType(TargetSP target_sp) { if (!compiler_type) { compiler_type = scratch_ts_sp->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, - g_lldb_autogen_nspair, llvm::to_underlying(clang::TagTypeKind::Struct), - lldb::eLanguageTypeC); + nullptr, OptionalClangModuleID(), g_lldb_autogen_nspair, + llvm::to_underlying(clang::TagTypeKind::Struct), lldb::eLanguageTypeC); if (compiler_type) { TypeSystemClang::StartTagDeclarationDefinition(compiler_type); CompilerType id_compiler_type = scratch_ts_sp->GetBasicType(eBasicTypeObjCID); - TypeSystemClang::AddFieldToRecordType( - compiler_type, "key", id_compiler_type, lldb::eAccessPublic, 0); - TypeSystemClang::AddFieldToRecordType( - compiler_type, "value", id_compiler_type, lldb::eAccessPublic, 0); + TypeSystemClang::AddFieldToRecordType(compiler_type, "key", + id_compiler_type, 0); + TypeSystemClang::AddFieldToRecordType(compiler_type, "value", + id_compiler_type, 0); TypeSystemClang::CompleteTagDeclarationDefinition(compiler_type); } } diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp index d328cbb830828..c8fc1f235409c 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp @@ -145,8 +145,7 @@ clang::QualType AppleObjCTypeEncodingParser::BuildAggregate( return clang::QualType(); // This is where we bail out. Sorry! CompilerType union_type(ast_ctx.CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, name, kind, - lldb::eLanguageTypeC)); + nullptr, OptionalClangModuleID(), name, kind, lldb::eLanguageTypeC)); if (union_type) { TypeSystemClang::StartTagDeclarationDefinition(union_type); @@ -157,9 +156,9 @@ clang::QualType AppleObjCTypeEncodingParser::BuildAggregate( elem_name.Printf("__unnamed_%u", count); element.name = std::string(elem_name.GetString()); } - TypeSystemClang::AddFieldToRecordType( - union_type, element.name.c_str(), ast_ctx.GetType(element.type), - lldb::eAccessPublic, element.bitfield); + TypeSystemClang::AddFieldToRecordType(union_type, element.name.c_str(), + ast_ctx.GetType(element.type), + element.bitfield); ++count; } TypeSystemClang::CompleteTagDeclarationDefinition(union_type); diff --git a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp index b537813709bc1..2e3454c9fbf41 100644 --- a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp +++ b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp @@ -204,40 +204,30 @@ CompilerType PlatformFreeBSD::GetSiginfoType(const llvm::Triple &triple) { CompilerType &uid_type = uint_type; CompilerType sigval_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_sigval_t", + nullptr, OptionalClangModuleID(), "__lldb_sigval_t", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(sigval_type); - ast->AddFieldToRecordType(sigval_type, "sival_int", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(sigval_type, "sival_int", int_type, 0); + ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type, 0); ast->CompleteTagDeclarationDefinition(sigval_type); // siginfo_t CompilerType siginfo_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_siginfo_t", + nullptr, OptionalClangModuleID(), "__lldb_siginfo_t", llvm::to_underlying(clang::TagTypeKind::Struct), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(siginfo_type); - ast->AddFieldToRecordType(siginfo_type, "si_signo", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_code", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_pid", pid_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_uid", uid_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_status", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_addr", voidp_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_value", sigval_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "si_signo", int_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_code", int_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_pid", pid_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_uid", uid_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_status", int_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_addr", voidp_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_value", sigval_type, 0); // union used to hold the signal data CompilerType union_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "", + nullptr, OptionalClangModuleID(), "", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(union_type); @@ -247,7 +237,7 @@ CompilerType PlatformFreeBSD::GetSiginfoType(const llvm::Triple &triple) { { {"_trapno", int_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_timer", @@ -256,7 +246,7 @@ CompilerType PlatformFreeBSD::GetSiginfoType(const llvm::Triple &triple) { {"_timerid", int_type}, {"_overrun", int_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_mesgq", @@ -264,7 +254,7 @@ CompilerType PlatformFreeBSD::GetSiginfoType(const llvm::Triple &triple) { { {"_mqd", int_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_poll", @@ -272,11 +262,10 @@ CompilerType PlatformFreeBSD::GetSiginfoType(const llvm::Triple &triple) { { {"_band", long_type}, }), - lldb::eAccessPublic, 0); + 0); ast->CompleteTagDeclarationDefinition(union_type); - ast->AddFieldToRecordType(siginfo_type, "_reason", union_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "_reason", union_type, 0); ast->CompleteTagDeclarationDefinition(siginfo_type); return siginfo_type; diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp index 932234521ccf5..799fe5eec29bc 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -446,17 +446,15 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { CompilerType &band_type = long_type; CompilerType sigval_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_sigval_t", + nullptr, OptionalClangModuleID(), "__lldb_sigval_t", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(sigval_type); - ast->AddFieldToRecordType(sigval_type, "sival_int", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(sigval_type, "sival_int", int_type, 0); + ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type, 0); ast->CompleteTagDeclarationDefinition(sigval_type); CompilerType sigfault_bounds_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "", + nullptr, OptionalClangModuleID(), "", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(sigfault_bounds_type); ast->AddFieldToRecordType( @@ -466,39 +464,32 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"_lower", voidp_type}, {"_upper", voidp_type}, }), - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(sigfault_bounds_type, "_pkey", uint_type, - lldb::eAccessPublic, 0); + 0); + ast->AddFieldToRecordType(sigfault_bounds_type, "_pkey", uint_type, 0); ast->CompleteTagDeclarationDefinition(sigfault_bounds_type); // siginfo_t CompilerType siginfo_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_siginfo_t", + nullptr, OptionalClangModuleID(), "__lldb_siginfo_t", llvm::to_underlying(clang::TagTypeKind::Struct), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(siginfo_type); - ast->AddFieldToRecordType(siginfo_type, "si_signo", int_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "si_signo", int_type, 0); if (si_errno_then_code) { - ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_code", int_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_code", int_type, 0); } else { - ast->AddFieldToRecordType(siginfo_type, "si_code", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "si_code", int_type, 0); + ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type, 0); } // the structure is padded on 64-bit arches to fix alignment if (triple.isArch64Bit()) - ast->AddFieldToRecordType(siginfo_type, "__pad0", int_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "__pad0", int_type, 0); // union used to hold the signal data CompilerType union_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "", + nullptr, OptionalClangModuleID(), "", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(union_type); @@ -509,7 +500,7 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"si_pid", pid_type}, {"si_uid", uid_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_timer", @@ -519,7 +510,7 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"si_overrun", int_type}, {"si_sigval", sigval_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_rt", @@ -529,7 +520,7 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"si_uid", uid_type}, {"si_sigval", sigval_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_sigchld", @@ -541,7 +532,7 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"si_utime", clock_type}, {"si_stime", clock_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_sigfault", @@ -551,7 +542,7 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"si_addr_lsb", short_type}, {"_bounds", sigfault_bounds_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_sigpoll", @@ -560,7 +551,7 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"si_band", band_type}, {"si_fd", int_type}, }), - lldb::eAccessPublic, 0); + 0); // NB: SIGSYS is not present on ia64 but we don't seem to support that ast->AddFieldToRecordType( @@ -571,11 +562,10 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { {"_syscall", int_type}, {"_arch", uint_type}, }), - lldb::eAccessPublic, 0); + 0); ast->CompleteTagDeclarationDefinition(union_type); - ast->AddFieldToRecordType(siginfo_type, "_sifields", union_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(siginfo_type, "_sifields", union_type, 0); ast->CompleteTagDeclarationDefinition(siginfo_type); return siginfo_type; diff --git a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp index ce81aab557062..e1ddbad37a203 100644 --- a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp +++ b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp @@ -227,51 +227,43 @@ CompilerType PlatformNetBSD::GetSiginfoType(const llvm::Triple &triple) { CompilerType &lwpid_type = int_type; CompilerType sigval_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_sigval_t", + nullptr, OptionalClangModuleID(), "__lldb_sigval_t", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(sigval_type); - ast->AddFieldToRecordType(sigval_type, "sival_int", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(sigval_type, "sival_int", int_type, 0); + ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type, 0); ast->CompleteTagDeclarationDefinition(sigval_type); CompilerType ptrace_option_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "", + nullptr, OptionalClangModuleID(), "", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(ptrace_option_type); - ast->AddFieldToRecordType(ptrace_option_type, "_pe_other_pid", pid_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(ptrace_option_type, "_pe_lwp", lwpid_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(ptrace_option_type, "_pe_other_pid", pid_type, 0); + ast->AddFieldToRecordType(ptrace_option_type, "_pe_lwp", lwpid_type, 0); ast->CompleteTagDeclarationDefinition(ptrace_option_type); // siginfo_t CompilerType siginfo_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_siginfo_t", + nullptr, OptionalClangModuleID(), "__lldb_siginfo_t", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(siginfo_type); // struct _ksiginfo CompilerType ksiginfo_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "", + nullptr, OptionalClangModuleID(), "", llvm::to_underlying(clang::TagTypeKind::Struct), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(ksiginfo_type); - ast->AddFieldToRecordType(ksiginfo_type, "_signo", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(ksiginfo_type, "_code", int_type, - lldb::eAccessPublic, 0); - ast->AddFieldToRecordType(ksiginfo_type, "_errno", int_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(ksiginfo_type, "_signo", int_type, 0); + ast->AddFieldToRecordType(ksiginfo_type, "_code", int_type, 0); + ast->AddFieldToRecordType(ksiginfo_type, "_errno", int_type, 0); // the structure is padded on 64-bit arches to fix alignment if (triple.isArch64Bit()) - ast->AddFieldToRecordType(ksiginfo_type, "__pad0", int_type, - lldb::eAccessPublic, 0); + ast->AddFieldToRecordType(ksiginfo_type, "__pad0", int_type, 0); // union used to hold the signal data CompilerType union_type = ast->CreateRecordType( - nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "", + nullptr, OptionalClangModuleID(), "", llvm::to_underlying(clang::TagTypeKind::Union), lldb::eLanguageTypeC); ast->StartTagDeclarationDefinition(union_type); @@ -283,7 +275,7 @@ CompilerType PlatformNetBSD::GetSiginfoType(const llvm::Triple &triple) { {"_uid", uid_type}, {"_value", sigval_type}, }), - lldb::eAccessPublic, 0); + 0); ast->AddFieldToRecordType( union_type, "_child", @@ -295,7 +287,7 @@ CompilerType PlatformNetBSD::GetSiginfoType(const llvm::Triple &triple) { {"_utime"... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/183023 _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
