maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Change DeclContextFindDeclByName to return a vector of CompilerDecl objects. Opaque pointers should only be used for the decl context object. Also made a default implementation so that GoASTContext doesn't need to override DeclContextFindDeclByName. 

llvm-svn: 255038
This commit is contained in:
Greg Clayton 2015-12-08 18:39:50 +00:00
parent aad25fb9a5
commit dfc0962196
6 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Symbol/ClangASTContext.h
View File

@ -564,7 +564,7 @@ public:
// CompilerDeclContext override functions
//----------------------------------------------------------------------
std::vector<void *>
std::vector<CompilerDecl>
DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name) override;
bool

6
lldb/include/lldb/Symbol/GoASTContext.h
View File

@ -100,12 +100,6 @@ class GoASTContext : public TypeSystem
// CompilerDeclContext functions
//----------------------------------------------------------------------
std::vector<void *>
DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name) override
{
return std::vector<void *>();
}
bool
DeclContextIsStructUnionOrClass(void *opaque_decl_ctx) override
{

5
lldb/include/lldb/Symbol/TypeSystem.h
View File

@ -25,6 +25,7 @@
#include "lldb/Core/PluginInterface.h"
#include "lldb/Expression/Expression.h"
#include "lldb/Host/Mutex.h"
#include "lldb/Symbol/CompilerDecl.h"
#include "lldb/Symbol/CompilerDeclContext.h"
class DWARFDIE;
@ -141,8 +142,8 @@ public:
// CompilerDeclContext functions
//----------------------------------------------------------------------
virtual std::vector<void *>
DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name) = 0;
virtual std::vector<CompilerDecl>
DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name);
virtual bool
DeclContextIsStructUnionOrClass (void *opaque_decl_ctx) = 0;

8
lldb/source/Symbol/ClangASTContext.cpp
View File

@ -9627,10 +9627,10 @@ ClangASTContext::DeclGetFunctionArgumentType (void *opaque_decl, size_t idx)
// CompilerDeclContext functions
//----------------------------------------------------------------------
std::vector<void *>
std::vector<CompilerDecl>
ClangASTContext::DeclContextFindDeclByName(void *opaque_decl_ctx, ConstString name)
{
std::vector<void *> found_decls;
std::vector<CompilerDecl> found_decls;
if (opaque_decl_ctx)
{
DeclContext *root_decl_ctx = (DeclContext *)opaque_decl_ctx;
@ -9665,7 +9665,7 @@ ClangASTContext::DeclContextFindDeclByName(void *opaque_decl_ctx, ConstString na
{
IdentifierInfo *ii = nd->getIdentifier();
if (ii != nullptr && ii->getName().equals(name.AsCString(nullptr)))
found_decls.push_back(nd);
found_decls.push_back(CompilerDecl(this, nd));
}
}
}
@ -9673,7 +9673,7 @@ ClangASTContext::DeclContextFindDeclByName(void *opaque_decl_ctx, ConstString na
{
IdentifierInfo *ii = nd->getIdentifier();
if (ii != nullptr && ii->getName().equals(name.AsCString(nullptr)))
found_decls.push_back(nd);
found_decls.push_back(CompilerDecl(this, nd));
}
}
}

10
lldb/source/Symbol/CompilerDeclContext.cpp
View File

@ -17,14 +17,10 @@ using namespace lldb_private;
std::vector<CompilerDecl>
CompilerDeclContext::FindDeclByName (ConstString name)
{
std::vector<CompilerDecl> found_decls;
if (IsValid())
{
std::vector<void *> found_opaque_decls = m_type_system->DeclContextFindDeclByName(m_opaque_decl_ctx, name);
for (void *opaque_decl : found_opaque_decls)
found_decls.push_back(CompilerDecl(m_type_system, opaque_decl));
}
return found_decls;
return m_type_system->DeclContextFindDeclByName(m_opaque_decl_ctx, name);
else
return std::vector<CompilerDecl>();
}
bool

8
lldb/source/Symbol/TypeSystem.cpp
View File

@ -151,6 +151,14 @@ TypeSystem::DeclGetFunctionArgumentType (void *opaque_decl, size_t arg_idx)
return CompilerType();
}
std::vector<CompilerDecl>
TypeSystem::DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name)
{
return std::vector<CompilerDecl>();
}
#pragma mark TypeSystemMap
TypeSystemMap::TypeSystemMap() :