diff options
| -rw-r--r-- | lib/Serialization/ASTReader.cpp | 3 | ||||
| -rw-r--r-- | test/Modules/embed-files.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 2defd38e27..8043cf8e90 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -1963,7 +1963,8 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) { // can lead to problems when lexing using the source locations from the // PCH. SourceManager &SM = getSourceManager(); - if (!Overridden && SM.isFileOverridden(File)) { + // FIXME: Reject if the overrides are different. + if ((!Overridden && !Transient) && SM.isFileOverridden(File)) { if (Complain) Error(diag::err_fe_pch_file_overridden, Filename); // After emitting the diagnostic, recover by disabling the override so diff --git a/test/Modules/embed-files.cpp b/test/Modules/embed-files.cpp new file mode 100644 index 0000000000..a1db21852d --- /dev/null +++ b/test/Modules/embed-files.cpp @@ -0,0 +1,15 @@ +// RUN: rm -rf %t +// RUN: mkdir %t +// RUN: echo 'module a { header "a.h" } module b { header "b.h" }' > %t/modulemap +// RUN: echo 'extern int t;' > %t/t.h +// RUN: echo '#include "t.h"' > %t/a.h +// RUN: echo '#include "t.h"' > %t/b.h + +// RUN: %clang_cc1 -fmodules -I%t -fmodules-cache-path=%t -fmodule-map-file=%t/modulemap -fmodules-embed-all-files %s -verify +#include "a.h" +char t; // expected-error {{different type}} +// expected-note@t.h:1 {{here}} +#include "t.h" +#include "b.h" +char t; // expected-error {{different type}} +// expected-note@t.h:1 {{here}} |