diff options
Diffstat (limited to 'tools/libclang/CIndex.cpp')
-rw-r--r-- | tools/libclang/CIndex.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 98891269d7..3c75e441b7 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -6305,10 +6305,12 @@ MacroInfo *cxindex::getMacroInfo(const IdentifierInfo &II, ASTUnit *Unit = cxtu::getASTUnit(TU); Preprocessor &PP = Unit->getPreprocessor(); MacroDirective *MD = PP.getMacroDirectiveHistory(&II); - while (MD) { - if (MacroDefLoc == MD->getInfo()->getDefinitionLoc()) - return MD->getInfo(); - MD = MD->getPrevious(); + if (MD) { + for (MacroDirective::DefInfo + Def = MD->getDefinition(); Def; Def = Def.getPreviousDefinition()) { + if (MacroDefLoc == Def.getMacroInfo()->getDefinitionLoc()) + return Def.getMacroInfo(); + } } return 0; @@ -6364,7 +6366,7 @@ MacroDefinition *cxindex::checkForMacroInMacroDefinition(const MacroInfo *MI, if (!InnerMD) return 0; - return PPRec->findMacroDefinition(InnerMD->getInfo()); + return PPRec->findMacroDefinition(InnerMD->getMacroInfo()); } MacroDefinition *cxindex::checkForMacroInMacroDefinition(const MacroInfo *MI, |