forked from OSchip/llvm-project
1f76c4e810
This allows using virtual file mappings on the original SourceManager to map in virtual module.map files. Without this patch, the ModuleMap search will find a module.map file (as the FileEntry exists in the FileManager), but will be unable to get the content from the SourceManager (as ModuleMap previously created its own SourceManager). Two problems needed to be fixed which this patch exposed: 1. Storing the inferred module map When writing out a module, the ASTWriter stores the names of the files in the main source manager; when loading the AST again, the ASTReader errs out if such a file is found missing, unless it is overridden. Previously CompilerInstance's compileModule method would store the inferred module map to a temporary file; the problem with this approach is that now that the module map is handled by the main source manager, the ASTWriter stores the name of the temporary module map as source to the compilation; later, when the module is loaded, the temporary file has already been deleted, which leads to a compilation error. This patch changes the inferred module map to instead inject a virtual file into the source manager. This both saves some disk IO, and works with how the ASTWriter/ASTReader handle overridden source files. 2. Changing test input in test/Modules/Inputs/* Now that the module map file is handled by the main source manager, the VerifyDiagnosticConsumer will not ignore diagnostics created while parsing the module map file. The module test test/Modules/renamed.m uses -I test/Modules/Inputs and triggers recursive loading of all module maps in test/Modules/Inputs, some of which had conflicting names, thus leading errors while parsing the module maps. Those diagnostics already occur on trunk, but before this patch they would not break the test, as they were ignored by the VerifyDiagnosticConsumer. This patch thus changes the module maps that have been recently introduced which broke the invariant of compatible modules maps in test/Modules/Inputs. llvm-svn: 193314 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| HeaderMap.cpp | ||
| HeaderSearch.cpp | ||
| Lexer.cpp | ||
| LiteralSupport.cpp | ||
| MacroArgs.cpp | ||
| MacroInfo.cpp | ||
| Makefile | ||
| 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 | ||