diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-02-24 00:05:14 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-02-24 00:05:14 +0000 |
| commit | fead64be9b9f5d8700bd4705efcb36194fbbb147 (patch) | |
| tree | 85d5319bb5ae43e5f3e4ef1e0d0214f2700490e8 /clang/lib/Lex/Preprocessor.cpp | |
| parent | ecd77a98f0e82a697c81be6d945cc81ebcba7f9b (diff) | |
| download | bcm5719-llvm-fead64be9b9f5d8700bd4705efcb36194fbbb147.tar.gz bcm5719-llvm-fead64be9b9f5d8700bd4705efcb36194fbbb147.zip | |
[preprocessor] Use MacroDirective in the preprocessor callbacks to make available the
full information about the macro (e.g if it was imported and where).
llvm-svn: 175978
Diffstat (limited to 'clang/lib/Lex/Preprocessor.cpp')
| -rw-r--r-- | clang/lib/Lex/Preprocessor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 8209c3c1365..af000ec1d14 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -642,10 +642,11 @@ void Preprocessor::HandleIdentifier(Token &Identifier) { } // If this is a macro to be expanded, do it. - if (MacroInfo *MI = getMacroInfo(&II)) { + if (MacroDirective *MD = getMacroDirective(&II)) { + MacroInfo *MI = MD->getInfo(); if (!DisableMacroExpansion) { if (!Identifier.isExpandDisabled() && MI->isEnabled()) { - if (!HandleMacroExpandedIdentifier(Identifier, MI)) + if (!HandleMacroExpandedIdentifier(Identifier, MD)) return; } else { // C99 6.10.3.4p2 says that a disabled macro may never again be |
