]> granicus.if.org Git - clang/commit
Revert r288626, which reverts r288449. Original commit message:
authorRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 6 Dec 2016 00:40:17 +0000 (00:40 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 6 Dec 2016 00:40:17 +0000 (00:40 +0000)
commitf7112d1137e4ce0a8dfaad2a424b3e6f61c68d9b
tree2b4ddb1f4ec92b04cdbe314b6445476a3a27cb99
parente5685e20486d5ed83d36d4131a01cf7073f1df36
Revert r288626, which reverts r288449. Original commit message:

Recover better from an incompatible .pcm file being provided by -fmodule-file=. We try to include the headers of the module textually in this case, still enforcing the modules semantic rules. In order to make that work, we need to still track that we're entering and leaving the module. Also, if the module was also marked as unavailable (perhaps because it was missing a file), we shouldn't mark the module unavailable -- we don't need the module to be complete if we're going to enter it textually.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@288741 91177308-0d34-0410-b5e6-96231b3b80d8
include/clang/Lex/ModuleLoader.h
lib/Frontend/CompilerInstance.cpp
lib/Lex/PPDirectives.cpp
test/Modules/config-mismatch.cpp [new file with mode: 0644]