Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-20 01:57:37 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

In DeclContext::LoadLexicalDeclsFromExternalStorage don't clear out

Browse Source 
the fields if they are already loaded, just ignore them when we are building
the chain in BuildDeclChain.

This fixes an lldb issue where fields were removed and not getting re-added
because lldb is based on ASTImporter adding decls to DeclContext and fields
were already added before by the ASTImporter.

We should really simplify the interaction between DeclContext <-> lldb
going forward..

rdar://10246067

llvm-svn: 141418
This commit is contained in:
Argyrios Kyrtzidis 2011-10-07 21:55:43 +00:00
parent 754eafb765
commit 094da739e0
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/AST/DeclBase.h
View File

@ -846,7 +846,7 @@ protected:
///
/// \returns the first/last pair of declarations.
static std::pair<Decl *, Decl *>
BuildDeclChain(const SmallVectorImpl<Decl*> &Decls);
BuildDeclChain(const SmallVectorImpl<Decl*> &Decls, bool FieldsAlreadyLoaded);
DeclContext(Decl::Kind K)
: DeclKind(K), ExternalLexicalStorage(false),

3
clang/lib/AST/Decl.cpp
View File

@ -2432,7 +2432,8 @@ void RecordDecl::LoadFieldsFromExternalStorage() const {
if (Decls.empty())
return;
llvm::tie(FirstDecl, LastDecl) = BuildDeclChain(Decls);
llvm::tie(FirstDecl, LastDecl) = BuildDeclChain(Decls,
/*FieldsAlreadyLoaded=*/false);
}
//===----------------------------------------------------------------------===//

31
clang/lib/AST/DeclBase.cpp
View File

@ -816,11 +816,15 @@ DeclContext *DeclContext::getNextContext() {
}
std::pair<Decl *, Decl *>
DeclContext::BuildDeclChain(const SmallVectorImpl<Decl*> &Decls) {
DeclContext::BuildDeclChain(const SmallVectorImpl<Decl*> &Decls,
bool FieldsAlreadyLoaded) {
// Build up a chain of declarations via the Decl::NextDeclInContext field.
Decl *FirstNewDecl = 0;
Decl *PrevDecl = 0;
for (unsigned I = 0, N = Decls.size(); I != N; ++I) {
if (FieldsAlreadyLoaded && isa<FieldDecl>(Decls[I]))
continue;
Decl *D = Decls[I];
if (PrevDecl)
PrevDecl->NextDeclInContext = D;
@ -842,22 +846,6 @@ DeclContext::LoadLexicalDeclsFromExternalStorage() const {
// Notify that we have a DeclContext that is initializing.
ExternalASTSource::Deserializing ADeclContext(Source);
// We may have already loaded just the fields of this record, in which case
// we remove all of the fields from the list. The fields will be reloaded
// from the external source as part of re-establishing the context.
if (const RecordDecl *RD = dyn_cast<RecordDecl>(this)) {
if (RD->LoadedFieldsFromExternalStorage) {
while (FirstDecl && isa<FieldDecl>(FirstDecl)) {
Decl *Next = FirstDecl->NextDeclInContext;
FirstDecl->NextDeclInContext = 0;
FirstDecl = Next;
}
if (!FirstDecl)
LastDecl = 0;
}
}
// Load the external declarations, if any.
SmallVector<Decl*, 64> Decls;
@ -874,10 +862,17 @@ DeclContext::LoadLexicalDeclsFromExternalStorage() const {
if (Decls.empty())
return;
// We may have already loaded just the fields of this record, in which case
// we need to ignore them.
bool FieldsAlreadyLoaded = false;
if (const RecordDecl *RD = dyn_cast<RecordDecl>(this))
FieldsAlreadyLoaded = RD->LoadedFieldsFromExternalStorage;
// Splice the newly-read declarations into the beginning of the list
// of declarations.
Decl *ExternalFirst, *ExternalLast;
llvm::tie(ExternalFirst, ExternalLast) = BuildDeclChain(Decls);
llvm::tie(ExternalFirst, ExternalLast) = BuildDeclChain(Decls,
FieldsAlreadyLoaded);
ExternalLast->NextDeclInContext = FirstDecl;
FirstDecl = ExternalFirst;
if (!LastDecl)