diff options
| author | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2017-01-11 02:14:51 +0000 |
|---|---|---|
| committer | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2017-01-11 02:14:51 +0000 |
| commit | ba1b5c98ba941b4382fc26bcf6b410c3120c22d9 (patch) | |
| tree | 57aab2e8e4e3995049e8d4aacdfd0f5c3dd29b46 /clang/lib/Lex/PPDirectives.cpp | |
| parent | e482403e1cfd86f289bb89f716fd71ec734c9931 (diff) | |
| download | bcm5719-llvm-ba1b5c98ba941b4382fc26bcf6b410c3120c22d9.tar.gz bcm5719-llvm-ba1b5c98ba941b4382fc26bcf6b410c3120c22d9.zip | |
[Modules] Support #import when entering files with modules
Textual headers and builtins that are #import'd from different
modules should get re-entered when these modules are independent
from each other.
Differential Revision: https://reviews.llvm.org/D26267
rdar://problem/25881934
llvm-svn: 291644
Diffstat (limited to 'clang/lib/Lex/PPDirectives.cpp')
| -rw-r--r-- | clang/lib/Lex/PPDirectives.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 9661e7b13f7..322c5809cd2 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -1999,6 +1999,7 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc, bool SkipHeader = false; if (ShouldEnter && !HeaderInfo.ShouldEnterIncludeFile(*this, File, isImport, + getLangOpts().Modules, SuggestedModule.getModule())) { ShouldEnter = false; SkipHeader = true; |
