Author: xiaobai Date: Tue Jul 2 12:53:07 2019 New Revision: 364962 URL: http://llvm.org/viewvc/llvm-project?rev=364962&view=rev Log: [Symbol] Add DeclVendor::FindTypes
Summary: Following up on the plan I outlined in D63622, we can remove the dependence on clang in all the places where we only want to find the types from the DeclVendor. This means that currently DeclVendor depends on clang, but centralizing the dependency makes it easier to refactor cleanly. Differential Revision: https://reviews.llvm.org/D63853 Added: lldb/trunk/source/Symbol/DeclVendor.cpp Modified: lldb/trunk/include/lldb/Symbol/DeclVendor.h lldb/trunk/source/API/SBTarget.cpp lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp lldb/trunk/source/Symbol/CMakeLists.txt Modified: lldb/trunk/include/lldb/Symbol/DeclVendor.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/DeclVendor.h?rev=364962&r1=364961&r2=364962&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/DeclVendor.h (original) +++ lldb/trunk/include/lldb/Symbol/DeclVendor.h Tue Jul 2 12:53:07 2019 @@ -47,6 +47,19 @@ public: uint32_t max_matches, std::vector<clang::NamedDecl *> &decls) = 0; + /// Look up the types that the DeclVendor currently knows about matching a + /// given name. + /// + /// \param[in] name + /// The name to look for. + /// + /// \param[in] max_matches + // The maximum number of matches. UINT32_MAX means "as many as possible". + /// + /// \return + /// The vector of CompilerTypes that was found. + std::vector<CompilerType> FindTypes(ConstString name, uint32_t max_matches); + /// Interface for ExternalASTMerger. Returns an ImporterSource /// allowing type completion. /// Modified: lldb/trunk/source/API/SBTarget.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTarget.cpp?rev=364962&r1=364961&r2=364962&view=diff ============================================================================== --- lldb/trunk/source/API/SBTarget.cpp (original) +++ lldb/trunk/source/API/SBTarget.cpp Tue Jul 2 12:53:07 2019 @@ -1847,18 +1847,12 @@ lldb::SBType SBTarget::FindFirstType(con } // Didn't find the type in the symbols; Try the loaded language runtimes - // FIXME: This depends on clang, but should be able to support any - // TypeSystem/compiler. if (auto process_sp = target_sp->GetProcessSP()) { for (auto *runtime : process_sp->GetLanguageRuntimes()) { if (auto vendor = runtime->GetDeclVendor()) { - std::vector<clang::NamedDecl *> decls; - if (vendor->FindDecls(const_typename, /*append*/ true, - /*max_matches*/ 1, decls) > 0) { - if (CompilerType type = - ClangASTContext::GetTypeForDecl(decls.front())) - return LLDB_RECORD_RESULT(SBType(type)); - } + auto types = vendor->FindTypes(const_typename, /*max_matches*/ 1); + if (!types.empty()) + return LLDB_RECORD_RESULT(SBType(types.front())); } } } @@ -1911,19 +1905,13 @@ lldb::SBTypeList SBTarget::FindTypes(con } // Try the loaded language runtimes - // FIXME: This depends on clang, but should be able to support any - // TypeSystem/compiler. if (auto process_sp = target_sp->GetProcessSP()) { for (auto *runtime : process_sp->GetLanguageRuntimes()) { if (auto *vendor = runtime->GetDeclVendor()) { - std::vector<clang::NamedDecl *> decls; - if (vendor->FindDecls(const_typename, /*append*/ true, - /*max_matches*/ 1, decls) > 0) { - for (auto *decl : decls) { - if (CompilerType type = ClangASTContext::GetTypeForDecl(decl)) - sb_type_list.Append(SBType(type)); - } - } + auto types = + vendor->FindTypes(const_typename, /*max_matches*/ UINT32_MAX); + for (auto type : types) + sb_type_list.Append(SBType(type)); } } } Modified: lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp?rev=364962&r1=364961&r2=364962&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp (original) +++ lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp Tue Jul 2 12:53:07 2019 @@ -932,25 +932,16 @@ std::unique_ptr<Language::TypeScavenger> ResultSet &results) override { bool result = false; - Process *process = exe_scope->CalculateProcess().get(); - if (process) { - auto objc_runtime = ObjCLanguageRuntime::Get(*process); - if (objc_runtime) { - auto decl_vendor = objc_runtime->GetDeclVendor(); - if (decl_vendor) { - std::vector<clang::NamedDecl *> decls; + if (auto *process = exe_scope->CalculateProcess().get()) { + if (auto *objc_runtime = ObjCLanguageRuntime::Get(*process)) { + if (auto *decl_vendor = objc_runtime->GetDeclVendor()) { ConstString name(key); - decl_vendor->FindDecls(name, true, UINT32_MAX, decls); - for (auto decl : decls) { - if (decl) { - if (CompilerType candidate = - ClangASTContext::GetTypeForDecl(decl)) { - result = true; - std::unique_ptr<Language::TypeScavenger::Result> result( - new ObjCScavengerResult(candidate)); - results.insert(std::move(result)); - } - } + for (const CompilerType &type : + decl_vendor->FindTypes(name, /*max_matches*/ UINT32_MAX)) { + result = true; + std::unique_ptr<Language::TypeScavenger::Result> result( + new ObjCScavengerResult(type)); + results.insert(std::move(result)); } } } @@ -968,21 +959,16 @@ std::unique_ptr<Language::TypeScavenger> ResultSet &results) override { bool result = false; - Target *target = exe_scope->CalculateTarget().get(); - if (target) { - if (auto clang_modules_decl_vendor = + if (auto *target = exe_scope->CalculateTarget().get()) { + if (auto *clang_modules_decl_vendor = target->GetClangModulesDeclVendor()) { - std::vector<clang::NamedDecl *> decls; ConstString key_cs(key); - - if (clang_modules_decl_vendor->FindDecls(key_cs, false, UINT32_MAX, - decls) > 0 && - !decls.empty()) { - CompilerType module_type = - ClangASTContext::GetTypeForDecl(decls.front()); + auto types = clang_modules_decl_vendor->FindTypes( + key_cs, /*max_matches*/ UINT32_MAX); + if (!types.empty()) { result = true; std::unique_ptr<Language::TypeScavenger::Result> result( - new ObjCScavengerResult(module_type)); + new ObjCScavengerResult(types.front())); results.insert(std::move(result)); } } Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=364962&r1=364961&r2=364962&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Tue Jul 2 12:53:07 2019 @@ -474,12 +474,10 @@ bool AppleObjCRuntimeV2::GetDynamicTypeA class_type_or_name.SetTypeSP(type_sp); } else { // try to go for a CompilerType at least - DeclVendor *vendor = GetDeclVendor(); - if (vendor) { - std::vector<clang::NamedDecl *> decls; - if (vendor->FindDecls(class_name, false, 1, decls) && decls.size()) - class_type_or_name.SetCompilerType( - ClangASTContext::GetTypeForDecl(decls[0])); + if (auto *vendor = GetDeclVendor()) { + auto types = vendor->FindTypes(class_name, /*max_matches*/ 1); + if (!types.empty()) + class_type_or_name.SetCompilerType(types.front()); } } } Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp?rev=364962&r1=364961&r2=364962&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp Tue Jul 2 12:53:07 2019 @@ -245,25 +245,19 @@ clang::QualType AppleObjCTypeEncodingPar if (!decl_vendor) return clang::QualType(); - const bool append = false; - const uint32_t max_matches = 1; - std::vector<clang::NamedDecl *> decls; - - uint32_t num_types = - decl_vendor->FindDecls(ConstString(name), append, max_matches, decls); + auto types = decl_vendor->FindTypes(ConstString(name), /*max_matches*/ 1); // The user can forward-declare something that has no definition. The runtime // doesn't prohibit this at all. This is a rare and very weird case. We keep // this assert in debug builds so we catch other weird cases. #ifdef LLDB_CONFIGURATION_DEBUG - assert(num_types); + assert(!types.empty()); #else - if (!num_types) + if (types.empty()) return ast_ctx.getObjCIdType(); #endif - return ClangUtil::GetQualType( - ClangASTContext::GetTypeForDecl(decls[0]).GetPointerType()); + return ClangUtil::GetQualType(types.front().GetPointerType()); } else { // We're going to resolve this dynamically anyway, so just smile and wave. return ast_ctx.getObjCIdType(); Modified: lldb/trunk/source/Symbol/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CMakeLists.txt?rev=364962&r1=364961&r2=364962&view=diff ============================================================================== --- lldb/trunk/source/Symbol/CMakeLists.txt (original) +++ lldb/trunk/source/Symbol/CMakeLists.txt Tue Jul 2 12:53:07 2019 @@ -21,6 +21,7 @@ add_lldb_library(lldbSymbol DWARFCallFrameInfo.cpp DebugMacros.cpp Declaration.cpp + DeclVendor.cpp FuncUnwinders.cpp Function.cpp LineEntry.cpp Added: lldb/trunk/source/Symbol/DeclVendor.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/DeclVendor.cpp?rev=364962&view=auto ============================================================================== --- lldb/trunk/source/Symbol/DeclVendor.cpp (added) +++ lldb/trunk/source/Symbol/DeclVendor.cpp Tue Jul 2 12:53:07 2019 @@ -0,0 +1,29 @@ +//===-- DeclVendor.cpp ------------------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "lldb/Symbol/DeclVendor.h" + +#include "lldb/Symbol/ClangASTContext.h" + +#include <vector> + +using namespace lldb; +using namespace lldb_private; + +std::vector<CompilerType> DeclVendor::FindTypes(ConstString name, + uint32_t max_matches) { + // FIXME: This depends on clang, but should be able to support any + // TypeSystem. + std::vector<CompilerType> ret; + std::vector<clang::NamedDecl *> decls; + if (FindDecls(name, /*append*/ true, max_matches, decls)) + for (auto *decl : decls) + if (auto type = ClangASTContext::GetTypeForDecl(decl)) + ret.push_back(type); + return ret; +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
