forked from OSchip/llvm-project
4971ed0fea
When reaching the end of a module, we used to convert its macros to ModuleMacros but also leave them in the MacroDirective chain for the identifier. This meant that every lookup of such a macro would find two (identical) definitions. It also made it difficult to determine the correct owner for a macro when reaching the end of a module: the most recent MacroDirective in the chain could be from an #included submodule rather than the current module. Simplify this: whenever we convert a MacroDirective to a ModuleMacro when leaving a module, clear out the MacroDirective chain for that identifier, and just rely on the ModuleMacro to provide the macro definition information. (We don't want to do this for local submodule visibility mode, because in that mode we maintain a distinct MacroDirective chain for each submodule, and we need to keep around the prior MacroDirective in case we re-enter the submodule -- for instance, if its header is #included more than once in a module build, we need the include guard directive to stick around. But the problem doesn't arise in this case for the same reason: each submodule has its own MacroDirective chain, so the macros don't leak out of submodules in the first place.) This reinstates r302932, reverted in r302947, with a fix for a bug that resulted in us sometimes losing macro definitions due to failing to clear out the overridden module macro list when promoting a directive to a module macro. llvm-svn: 303468 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| HeaderMap.cpp | ||
| HeaderSearch.cpp | ||
| Lexer.cpp | ||
| LiteralSupport.cpp | ||
| MacroArgs.cpp | ||
| MacroInfo.cpp | ||
| ModuleMap.cpp | ||
| PPCaching.cpp | ||
| PPCallbacks.cpp | ||
| PPConditionalDirectiveRecord.cpp | ||
| PPDirectives.cpp | ||
| PPExpressions.cpp | ||
| PPLexerChange.cpp | ||
| PPMacroExpansion.cpp | ||
| PTHLexer.cpp | ||
| Pragma.cpp | ||
| PreprocessingRecord.cpp | ||
| Preprocessor.cpp | ||
| PreprocessorLexer.cpp | ||
| ScratchBuffer.cpp | ||
| TokenConcatenation.cpp | ||
| TokenLexer.cpp | ||
| UnicodeCharSets.h | ||