diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Serialization/ASTWriter.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/macros_top.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 033d48c1471..6893b5003ff 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -2937,6 +2937,7 @@ class ASTIdentifierTableTrait { if (!MD) return 0; + SubmoduleID OrigModID = ModID; bool isUndefined = false; Optional<bool> isPublic; for (; MD; MD = MD->getPrevious()) { @@ -2954,6 +2955,11 @@ class ASTIdentifierTableTrait { isUndefined = false; isPublic = Optional<bool>(); } + // We are looking for a definition in a different submodule than the one + // that we started with. If a submodule has re-definitions of the same + // macro, only the last definition will be used as the "exported" one. + if (ModID == OrigModID) + continue; if (DefMacroDirective *DefMD = dyn_cast<DefMacroDirective>(MD)) { if (!isUndefined && (!isPublic.hasValue() || isPublic.getValue())) diff --git a/clang/test/Modules/Inputs/macros_top.h b/clang/test/Modules/Inputs/macros_top.h index 9c3f3c071fd..dd303ffee4e 100644 --- a/clang/test/Modules/Inputs/macros_top.h +++ b/clang/test/Modules/Inputs/macros_top.h @@ -8,8 +8,8 @@ - - +#define TOP_RIGHT_REDEF float +// The last definition will be exported from the sub-module. #define TOP_RIGHT_REDEF int #define TOP_RIGHT_UNDEF int |
