diff options
Diffstat (limited to 'lldb/source/Plugins/SymbolFile')
10 files changed, 57 insertions, 57 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.h index 7af63b73c5b..2fb360440f6 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.h @@ -35,7 +35,7 @@ public: virtual bool CompleteTypeFromDWARF (const DWARFDIE &die, lldb_private::Type *type, - lldb_private::CompilerType &clang_type) = 0; + lldb_private::CompilerType &compiler_type) = 0; virtual lldb_private::CompilerDecl GetDeclForUIDFromDWARF (const DWARFDIE &die) = 0; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h index a9a0cfeb696..c9672a13a94 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h @@ -46,7 +46,7 @@ public: virtual bool CompleteTypeFromDWARF (const DWARFDIE &die, lldb_private::Type *type, - lldb_private::CompilerType &clang_type) override; + lldb_private::CompilerType &compiler_type) override; virtual lldb_private::CompilerDecl GetDeclForUIDFromDWARF (const DWARFDIE &die) override; @@ -107,7 +107,7 @@ protected: bool ParseChildMembers (const lldb_private::SymbolContext& sc, const DWARFDIE &die, - lldb_private::CompilerType &class_clang_type, + lldb_private::CompilerType &class_compiler_type, const lldb::LanguageType class_language, std::vector<clang::CXXBaseSpecifier *>& base_classes, std::vector<int>& member_accessibilities, @@ -140,7 +140,7 @@ protected: size_t ParseChildEnumerators (const lldb_private::SymbolContext& sc, - lldb_private::CompilerType &clang_type, + lldb_private::CompilerType &compiler_type, bool is_signed, uint32_t enumerator_byte_size, const DWARFDIE &parent_die); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.cpp index 3f90e642667..faf0da31b08 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.cpp @@ -91,7 +91,7 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons Declaration decl; Type::EncodingDataType encoding_data_type = Type::eEncodingIsUID; - CompilerType clang_type; + CompilerType compiler_type; DWARFFormValue form_value; dw_attr_t attr; @@ -155,12 +155,12 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons case DW_TAG_unspecified_type: resolve_state = Type::eResolveStateFull; - clang_type = m_ast.CreateVoidType(type_name_const_str); + compiler_type = m_ast.CreateVoidType(type_name_const_str); break; case DW_TAG_base_type: resolve_state = Type::eResolveStateFull; - clang_type = m_ast.CreateBaseType(go_kind, type_name_const_str, byte_size); + compiler_type = m_ast.CreateBaseType(go_kind, type_name_const_str, byte_size); break; case DW_TAG_pointer_type: @@ -179,13 +179,13 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons return type->shared_from_this(); } impl = type->GetForwardCompilerType(); - clang_type = m_ast.CreateTypedefType (go_kind, type_name_const_str, impl); + compiler_type = m_ast.CreateTypedefType (go_kind, type_name_const_str, impl); } break; } type_sp.reset(new Type(dwarf->MakeUserID(die.GetOffset()), dwarf, type_name_const_str, byte_size, - NULL, encoding_uid, encoding_data_type, &decl, clang_type, resolve_state)); + NULL, encoding_uid, encoding_data_type, &decl, compiler_type, resolve_state)); dwarf->m_die_to_type[die.GetDIE()] = type_sp.get(); } @@ -258,16 +258,16 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons DEBUG_PRINTF("0x%8.8" PRIx64 ": %s (\"%s\")\n", dwarf->MakeUserID(die.GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr); - bool clang_type_was_created = false; - clang_type.SetCompilerType(&m_ast, dwarf->m_forward_decl_die_to_clang_type.lookup(die.GetDIE())); - if (!clang_type) + bool compiler_type_was_created = false; + compiler_type.SetCompilerType(&m_ast, dwarf->m_forward_decl_die_to_clang_type.lookup(die.GetDIE())); + if (!compiler_type) { - clang_type_was_created = true; - clang_type = m_ast.CreateStructType(go_kind, type_name_const_str, byte_size); + compiler_type_was_created = true; + compiler_type = m_ast.CreateStructType(go_kind, type_name_const_str, byte_size); } type_sp.reset(new Type(dwarf->MakeUserID(die.GetOffset()), dwarf, type_name_const_str, byte_size, - NULL, LLDB_INVALID_UID, Type::eEncodingIsUID, &decl, clang_type, + NULL, LLDB_INVALID_UID, Type::eEncodingIsUID, &decl, compiler_type, Type::eResolveStateForward)); // Add our type to the unique type map so we don't @@ -288,18 +288,18 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons if (die.HasChildren() == false) { // No children for this struct/union/class, lets finish it - m_ast.CompleteStructType(clang_type); + m_ast.CompleteStructType(compiler_type); } - else if (clang_type_was_created) + else if (compiler_type_was_created) { // Leave this as a forward declaration until we need // to know the details of the type. lldb_private::Type // will automatically call the SymbolFile virtual function // "SymbolFileDWARF::CompleteType(Type *)" // When the definition needs to be defined. - dwarf->m_forward_decl_die_to_clang_type[die.GetDIE()] = clang_type.GetOpaqueQualType(); - dwarf->m_forward_decl_clang_type_to_die[clang_type.GetOpaqueQualType()] = die.GetDIERef(); - // SetHasExternalStorage (clang_type.GetOpaqueQualType(), true); + dwarf->m_forward_decl_die_to_clang_type[die.GetDIE()] = compiler_type.GetOpaqueQualType(); + dwarf->m_forward_decl_clang_type_to_die[compiler_type.GetOpaqueQualType()] = die.GetDIERef(); + // SetHasExternalStorage (compiler_type.GetOpaqueQualType(), true); } } } @@ -360,12 +360,12 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons ParseChildParameters(sc, die, is_variadic, function_param_types); } - // clang_type will get the function prototype clang type after this call - clang_type = m_ast.CreateFunctionType(type_name_const_str, function_param_types.data(), + // compiler_type will get the function prototype clang type after this call + compiler_type = m_ast.CreateFunctionType(type_name_const_str, function_param_types.data(), function_param_types.size(), is_variadic); type_sp.reset(new Type(dwarf->MakeUserID(die.GetOffset()), dwarf, type_name_const_str, 0, NULL, - LLDB_INVALID_UID, Type::eEncodingIsUID, &decl, clang_type, + LLDB_INVALID_UID, Type::eEncodingIsUID, &decl, compiler_type, Type::eResolveStateFull)); assert(type_sp.get()); } @@ -427,16 +427,16 @@ DWARFASTParserGo::ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, cons { if (element_orders.size() > 1) printf("golang: unsupported multi-dimensional array %s\n", type_name_cstr); - clang_type = + compiler_type = m_ast.CreateArrayType(type_name_const_str, array_element_type, element_orders[0]); } else { - clang_type = m_ast.CreateArrayType(type_name_const_str, array_element_type, 0); + compiler_type = m_ast.CreateArrayType(type_name_const_str, array_element_type, 0); } type_sp.reset(new Type(dwarf->MakeUserID(die.GetOffset()), dwarf, type_name_const_str, byte_stride, NULL, type_die_offset, Type::eEncodingIsUID, &decl, - clang_type, Type::eResolveStateFull)); + compiler_type, Type::eResolveStateFull)); type_sp->SetEncodingType(element_type); } } @@ -619,7 +619,7 @@ DWARFASTParserGo::ParseChildArrayInfo(const SymbolContext &sc, const DWARFDIE &p } bool -DWARFASTParserGo::CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type *type, CompilerType &clang_type) +DWARFASTParserGo::CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type *type, CompilerType &compiler_type) { if (!die) return false; @@ -632,7 +632,7 @@ DWARFASTParserGo::CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type dwarf->GetObjectFile()->GetModule()->LogMessageVerboseBacktrace( log, "0x%8.8" PRIx64 ": %s '%s' resolving forward declaration...", dwarf->MakeUserID(die.GetOffset()), DW_TAG_value_to_name(tag), type->GetName().AsCString()); - assert(clang_type); + assert(compiler_type); DWARFAttributes attributes; switch (tag) @@ -644,11 +644,11 @@ DWARFASTParserGo::CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type { SymbolContext sc(die.GetLLDBCompileUnit()); - ParseChildMembers(sc, die, clang_type); + ParseChildMembers(sc, die, compiler_type); } } - m_ast.CompleteStructType(clang_type); - return (bool)clang_type; + m_ast.CompleteStructType(compiler_type); + return (bool)compiler_type; } default: @@ -660,13 +660,13 @@ DWARFASTParserGo::CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type } size_t -DWARFASTParserGo::ParseChildMembers(const SymbolContext &sc, const DWARFDIE &parent_die, CompilerType &class_clang_type) +DWARFASTParserGo::ParseChildMembers(const SymbolContext &sc, const DWARFDIE &parent_die, CompilerType &class_compiler_type) { size_t count = 0; uint32_t member_idx = 0; ModuleSP module_sp = parent_die.GetDWARF()->GetObjectFile()->GetModule(); - GoASTContext *ast = llvm::dyn_cast_or_null<GoASTContext>(class_clang_type.GetTypeSystem()); + GoASTContext *ast = llvm::dyn_cast_or_null<GoASTContext>(class_compiler_type.GetTypeSystem()); if (ast == nullptr) return 0; @@ -742,7 +742,7 @@ DWARFASTParserGo::ParseChildMembers(const SymbolContext &sc, const DWARFDIE &par { CompilerType member_go_type = member_type->GetFullCompilerType(); ConstString name_const_str(name); - m_ast.AddFieldToStruct(class_clang_type, name_const_str, member_go_type, member_byte_offset); + m_ast.AddFieldToStruct(class_compiler_type, name_const_str, member_go_type, member_byte_offset); } } ++member_idx; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.h index 85b2425ea8b..b01e1e55607 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserGo.h @@ -71,7 +71,7 @@ class DWARFASTParserGo : public DWARFASTParser std::vector<uint64_t> &element_orders, uint32_t &byte_stride, uint32_t &bit_stride); size_t ParseChildMembers(const lldb_private::SymbolContext &sc, const DWARFDIE &die, - lldb_private::CompilerType &class_clang_type); + lldb_private::CompilerType &class_compiler_type); lldb_private::GoASTContext &m_ast; }; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 43c3d7676ec..4db11b26845 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -382,14 +382,14 @@ SymbolFileDWARF::GetTypes (SymbolContextScope *sc_scope, } } - std::set<CompilerType> clang_type_set; + std::set<CompilerType> compiler_type_set; size_t num_types_added = 0; for (Type *type : type_set) { - CompilerType clang_type = type->GetForwardCompilerType (); - if (clang_type_set.find(clang_type) == clang_type_set.end()) + CompilerType compiler_type = type->GetForwardCompilerType (); + if (compiler_type_set.find(compiler_type) == compiler_type_set.end()) { - clang_type_set.insert(clang_type); + compiler_type_set.insert(compiler_type); type_list.Insert (type->shared_from_this()); ++num_types_added; } @@ -1530,21 +1530,21 @@ SymbolFileDWARF::ResolveTypeUID (const DWARFDIE &die, bool assert_not_being_pars // This function is used when SymbolFileDWARFDebugMap owns a bunch of // SymbolFileDWARF objects to detect if this DWARF file is the one that -// can resolve a clang_type. +// can resolve a compiler_type. bool -SymbolFileDWARF::HasForwardDeclForClangType (const CompilerType &clang_type) +SymbolFileDWARF::HasForwardDeclForClangType (const CompilerType &compiler_type) { - CompilerType clang_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(clang_type); - return GetForwardDeclClangTypeToDie().count (clang_type_no_qualifiers.GetOpaqueQualType()); + CompilerType compiler_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(compiler_type); + return GetForwardDeclClangTypeToDie().count (compiler_type_no_qualifiers.GetOpaqueQualType()); } bool -SymbolFileDWARF::CompleteType (CompilerType &clang_type) +SymbolFileDWARF::CompleteType (CompilerType &compiler_type) { // We have a struct/union/class/enum that needs to be fully resolved. - CompilerType clang_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(clang_type); - auto die_it = GetForwardDeclClangTypeToDie().find (clang_type_no_qualifiers.GetOpaqueQualType()); + CompilerType compiler_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(compiler_type); + auto die_it = GetForwardDeclClangTypeToDie().find (compiler_type_no_qualifiers.GetOpaqueQualType()); if (die_it == GetForwardDeclClangTypeToDie().end()) { // We have already resolved this type... @@ -1569,10 +1569,10 @@ SymbolFileDWARF::CompleteType (CompilerType &clang_type) dwarf_die.GetID(), dwarf_die.GetTagAsCString(), type->GetName().AsCString()); - assert (clang_type); + assert (compiler_type); DWARFASTParser *dwarf_ast = dwarf_die.GetDWARFParser(); if (dwarf_ast) - return dwarf_ast->CompleteTypeFromDWARF (dwarf_die, type, clang_type); + return dwarf_ast->CompleteTypeFromDWARF (dwarf_die, type, compiler_type); return false; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h index 49b0e1de523..2466a4b74bb 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -143,7 +143,7 @@ public: ResolveTypeUID(lldb::user_id_t type_uid) override; bool - CompleteType (lldb_private::CompilerType& clang_type) override; + CompleteType (lldb_private::CompilerType& compiler_type) override; lldb_private::Type * ResolveType (const DWARFDIE &die, @@ -292,7 +292,7 @@ public: } bool - HasForwardDeclForClangType (const lldb_private::CompilerType &clang_type); + HasForwardDeclForClangType (const lldb_private::CompilerType &compiler_type); lldb_private::CompileUnit* GetCompUnitForDWARFCompUnit(DWARFCompileUnit* dwarf_cu, diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index 6d33d6cb4f5..795e7e5d70e 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -778,15 +778,15 @@ SymbolFileDWARFDebugMap::ResolveTypeUID(lldb::user_id_t type_uid) } bool -SymbolFileDWARFDebugMap::CompleteType (CompilerType& clang_type) +SymbolFileDWARFDebugMap::CompleteType (CompilerType& compiler_type) { bool success = false; - if (clang_type) + if (compiler_type) { ForEachSymbolFile([&](SymbolFileDWARF *oso_dwarf) -> bool { - if (oso_dwarf->HasForwardDeclForClangType (clang_type)) + if (oso_dwarf->HasForwardDeclForClangType (compiler_type)) { - oso_dwarf->CompleteType (clang_type); + oso_dwarf->CompleteType (compiler_type); success = true; return true; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h index fde63ab8095..25fd67b7d90 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h @@ -72,7 +72,7 @@ public: lldb_private::Type* ResolveTypeUID (lldb::user_id_t type_uid) override; lldb_private::CompilerDeclContext GetDeclContextForUID (lldb::user_id_t uid) override; lldb_private::CompilerDeclContext GetDeclContextContainingUID (lldb::user_id_t uid) override; - bool CompleteType (lldb_private::CompilerType& clang_type) override; + bool CompleteType (lldb_private::CompilerType& compiler_type) override; uint32_t ResolveSymbolContext (const lldb_private::Address& so_addr, uint32_t resolve_scope, lldb_private::SymbolContext& sc) override; uint32_t ResolveSymbolContext (const lldb_private::FileSpec& file_spec, uint32_t line, bool check_inlines, uint32_t resolve_scope, lldb_private::SymbolContextList& sc_list) override; uint32_t FindGlobalVariables (const lldb_private::ConstString &name, const lldb_private::CompilerDeclContext *parent_decl_ctx, bool append, uint32_t max_matches, lldb_private::VariableList& variables) override; diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp index d535efd1f13..ea8991c6351 100644 --- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp +++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp @@ -291,7 +291,7 @@ SymbolFileSymtab::ResolveTypeUID(lldb::user_id_t type_uid) } bool -SymbolFileSymtab::CompleteType (lldb_private::CompilerType& clang_opaque_type) +SymbolFileSymtab::CompleteType (lldb_private::CompilerType& compiler_type) { return false; } diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h index f130cdb07f3..883055e2edf 100644 --- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h +++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h @@ -82,7 +82,7 @@ public: ResolveTypeUID(lldb::user_id_t type_uid); virtual bool - CompleteType (lldb_private::CompilerType& clang_type); + CompleteType (lldb_private::CompilerType& compiler_type); virtual uint32_t ResolveSymbolContext (const lldb_private::Address& so_addr, uint32_t resolve_scope, lldb_private::SymbolContext& sc); |
