diff options
| author | Manman Ren <manman.ren@gmail.com> | 2016-10-21 23:35:03 +0000 |
|---|---|---|
| committer | Manman Ren <manman.ren@gmail.com> | 2016-10-21 23:35:03 +0000 |
| commit | c8c9415644fa2cce5b65d8ea005e62ac59a73708 (patch) | |
| tree | c3132c408c11cec57d047dc89f86f93baeb4c0cc | |
| parent | 0db4549a1e2ba13806354cfe489df0e4fc94ced4 (diff) | |
| download | bcm5719-llvm-c8c9415644fa2cce5b65d8ea005e62ac59a73708.tar.gz bcm5719-llvm-c8c9415644fa2cce5b65d8ea005e62ac59a73708.zip | |
Module: correctly set the module file kind when emitting file_modified.
rdar://28503343
Differential Revision: http://reviews.llvm.org/D25806
llvm-svn: 284899
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSerializationKinds.td | 6 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Modules/module-file-modified.c | 11 |
3 files changed, 25 insertions, 1 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSerializationKinds.td b/clang/include/clang/Basic/DiagnosticSerializationKinds.td index 16c77435558..066a1f5fa68 100644 --- a/clang/include/clang/Basic/DiagnosticSerializationKinds.td +++ b/clang/include/clang/Basic/DiagnosticSerializationKinds.td @@ -21,6 +21,12 @@ def err_fe_pch_malformed_block : Error< def err_fe_pch_file_modified : Error< "file '%0' has been modified since the precompiled header '%1' was built">, DefaultFatal; +def err_fe_module_file_modified : Error< + "file '%0' has been modified since the module file '%1' was built">, + DefaultFatal; +def err_fe_ast_file_modified : Error< + "file '%0' has been modified since the AST file '%1' was built">, + DefaultFatal; def err_fe_pch_file_overridden : Error< "file '%0' from the precompiled header has been overridden">; def note_pch_required_by : Note<"'%0' required by '%1'">; diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 8ce118ce710..57de217078f 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -1983,6 +1983,7 @@ ASTReader::readInputFileInfo(ModuleFile &F, unsigned ID) { return R; } +static unsigned moduleKindForDiagnostic(ModuleKind Kind); InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) { // If this ID is bogus, just return an empty input file. if (ID == 0 || ID > F.InputFilesLoaded.size()) @@ -2079,7 +2080,13 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) { // The top-level PCH is stale. StringRef TopLevelPCHName(ImportStack.back()->FileName); - Error(diag::err_fe_pch_file_modified, Filename, TopLevelPCHName); + unsigned DiagnosticKind = moduleKindForDiagnostic(ImportStack.back()->Kind); + if (DiagnosticKind == 0) + Error(diag::err_fe_pch_file_modified, Filename, TopLevelPCHName); + else if (DiagnosticKind == 1) + Error(diag::err_fe_module_file_modified, Filename, TopLevelPCHName); + else + Error(diag::err_fe_ast_file_modified, Filename, TopLevelPCHName); // Print the import stack. if (ImportStack.size() > 1 && !Diags.isDiagnosticInFlight()) { diff --git a/clang/test/Modules/module-file-modified.c b/clang/test/Modules/module-file-modified.c new file mode 100644 index 00000000000..85018b521e2 --- /dev/null +++ b/clang/test/Modules/module-file-modified.c @@ -0,0 +1,11 @@ +// RUN: rm -rf %t +// RUN: mkdir %t +// RUN: echo 'int foo = 0;' > %t/a.h +// RUN: echo 'module A { header "a.h" }' > %t/m.modulemap +// RUN: %clang_cc1 -fmodules -emit-module -fmodule-name=A -x c %t/m.modulemap -o %t/m.pcm +// RUN: echo 'int bar;' > %t/a.h +// RUN: not %clang_cc1 -fmodules -fmodule-file=%t/m.pcm -fmodule-map-file=%t/m.modulemap -x c %s -I%t -fsyntax-only 2>&1 | FileCheck %s +#include "a.h" +int foo = 0; // redefinition of 'foo' +// CHECK: fatal error: file {{.*}} has been modified since the module file {{.*}} was built +// REQUIRES: shell |
