std::vector<include_cleaner::SymbolReference>
collectMacroReferences(ParsedAST &AST) {
const auto &SM = AST.getSourceManager();
- // FIXME: !!this is a hacky way to collect macro references.
- std::vector<include_cleaner::SymbolReference> Macros;
auto &PP = AST.getPreprocessor();
- for (const syntax::Token &Tok :
- AST.getTokens().spelledTokens(SM.getMainFileID())) {
- auto Macro = locateMacroAt(Tok, PP);
- if (!Macro)
- continue;
- if (auto DefLoc = Macro->Info->getDefinitionLoc(); DefLoc.isValid())
+ std::vector<include_cleaner::SymbolReference> Macros;
+ for (const auto &[_, Refs] : AST.getMacros().MacroRefs) {
+ for (const auto &Ref : Refs) {
+ auto Loc = SM.getComposedLoc(SM.getMainFileID(), Ref.StartOffset);
+ const auto *Tok = AST.getTokens().spelledTokenAt(Loc);
+ if (!Tok)
+ continue;
+ auto Macro = locateMacroAt(*Tok, PP);
+ if (!Macro)
+ continue;
+ auto DefLoc = Macro->NameLoc;
+ if (!DefLoc.isValid())
+ continue;
Macros.push_back(
- {include_cleaner::Macro{/*Name=*/PP.getIdentifierInfo(Tok.text(SM)),
+ {include_cleaner::Macro{/*Name=*/PP.getIdentifierInfo(Tok->text(SM)),
DefLoc},
- Tok.location(), include_cleaner::RefType::Explicit});
+ Tok->location(),
+ Ref.InConditionalDirective ? include_cleaner::RefType::Ambiguous
+ : include_cleaner::RefType::Explicit});
+ }
}
+
return Macros;
}