diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-04-03 17:39:30 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-04-03 17:39:30 +0000 |
| commit | bd25ff8632e18bb3af761369fd3b0f1b48fdf061 (patch) | |
| tree | f90c89c23c1a46c4171646584fcbabe8f70aa66e /lib/Serialization | |
| parent | 9f4f5f1ca1e1967daf64d5422717c9b1e75eeb9e (diff) | |
[preprocessor] Allow comparing two macro definitions syntactically instead of only lexically.
Syntactically means the function macro parameter names do not need to use the same
identifiers in order for the definitions to be considered identical.
Syntactic equivalence is a microsoft extension for macro redefinitions and we'll also
use this kind of comparison to check for ambiguous macros coming from modules.
rdar://13562254
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178671 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Serialization')
| -rw-r--r-- | lib/Serialization/ASTReader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 4c2d2197e4..4c4277c30f 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -1604,7 +1604,8 @@ void ASTReader::installImportedMacro(IdentifierInfo *II, MacroDirective *MD, MacroDirective::DefInfo PrevDef = Prev->getDefinition(); MacroInfo *PrevMI = PrevDef.getMacroInfo(); MacroInfo *NewMI = DefMD->getInfo(); - if (NewMI != PrevMI && !PrevMI->isIdenticalTo(*NewMI, PP)) { + if (NewMI != PrevMI && !PrevMI->isIdenticalTo(*NewMI, PP, + /*Syntactically=*/true)) { // Before marking the macros as ambiguous, check if this is a case where // the system macro uses a not identical definition compared to a macro // from the clang headers. For example: |