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];
return CacheEntry;
for (const Decl *Redecl = D; Redecl; Redecl = Redecl->getPreviousDecl())
- if (isLocalDecl(*this, Redecl))
+ if (IsLocalDecl(Redecl))
D = Redecl;
return CacheEntry = D;
}