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

[modules] Slightly defang an assert that produces false-positives on the selfhost bot. 

llvm-svn: 247375
This commit is contained in:
Richard Smith 2015-09-11 02:22:03 +00:00
parent 59d72b1c8a
commit 3864be7bf0
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/Serialization/ASTWriterDecl.cpp
View File

@ -1522,20 +1522,21 @@ void ASTDeclWriter::VisitDeclContext(DeclContext *DC, uint64_t LexicalOffset,
Record.push_back(VisibleOffset);
}
/// \brief Is this a local declaration (that is, one that will be written to
/// our AST file)? This is the case for declarations that are neither imported
/// from another AST file nor predefined.
static bool isLocalDecl(ASTWriter &W, const Decl *D) {
if (D->isFromASTFile())
return false;
return W.getDeclID(D) >= NUM_PREDEF_DECL_IDS;
}
const Decl *ASTWriter::getFirstLocalDecl(const Decl *D) {
assert(isLocalDecl(*this, D) && "expected a local declaration");
/// \brief Is this a local declaration (that is, one that will be written to
/// our AST file)? This is the case for declarations that are neither imported
/// from another AST file nor predefined.
auto IsLocalDecl = [&](const Decl *D) -> bool {
if (D->isFromASTFile())
return false;
auto I = DeclIDs.find(D);
return (I == DeclIDs.end() || I->second >= NUM_PREDEF_DECL_IDS);
};
assert(IsLocalDecl(D) && "expected a local declaration");
const Decl *Canon = D->getCanonicalDecl();
if (isLocalDecl(*this, Canon))
if (IsLocalDecl(Canon))
return Canon;
const Decl *&CacheEntry = FirstLocalDeclCache[Canon];
@ -1543,7 +1544,7 @@ const Decl *ASTWriter::getFirstLocalDecl(const Decl *D) {
return CacheEntry;
for (const Decl *Redecl = D; Redecl; Redecl = Redecl->getPreviousDecl())
if (isLocalDecl(*this, Redecl))
if (IsLocalDecl(Redecl))
D = Redecl;
return CacheEntry = D;
}