Skip to content

Commit fbd695a

Browse files
committed
[clang] Rename diagnostic notes that assumed precompiled dependencies
are pch's NFCI
1 parent 8e2641a commit fbd695a

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

clang/include/clang/Basic/DiagnosticSerializationKinds.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def err_fe_ast_file_modified : Error<
2424
DefaultFatal;
2525
def err_fe_pch_file_overridden : Error<
2626
"file '%0' from the precompiled header has been overridden">;
27-
def note_pch_required_by : Note<"'%0' required by '%1'">;
28-
def note_pch_rebuild_required : Note<"please rebuild precompiled header '%0'">;
27+
def note_ast_file_required_by : Note<"'%0' required by '%1'">;
28+
def note_ast_file_rebuild_required : Note<"please rebuild precompiled file '%0'">;
2929
def note_module_cache_path : Note<
3030
"after modifying system headers, please delete the module cache at '%0'">;
3131

clang/lib/Serialization/ASTReader.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,25 +2862,25 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
28622862
while (!ImportStack.back()->ImportedBy.empty())
28632863
ImportStack.push_back(ImportStack.back()->ImportedBy[0]);
28642864

2865-
// The top-level PCH is stale.
2866-
StringRef TopLevelPCHName(ImportStack.back()->FileName);
2865+
// The top-level AST file is stale.
2866+
StringRef TopLevelASTFileName(ImportStack.back()->FileName);
28672867
Diag(diag::err_fe_ast_file_modified)
28682868
<< *Filename << moduleKindForDiagnostic(ImportStack.back()->Kind)
2869-
<< TopLevelPCHName << FileChange.Kind
2869+
<< TopLevelASTFileName << FileChange.Kind
28702870
<< (FileChange.Old && FileChange.New)
28712871
<< llvm::itostr(FileChange.Old.value_or(0))
28722872
<< llvm::itostr(FileChange.New.value_or(0));
28732873

28742874
// Print the import stack.
28752875
if (ImportStack.size() > 1) {
2876-
Diag(diag::note_pch_required_by)
2876+
Diag(diag::note_ast_file_required_by)
28772877
<< *Filename << ImportStack[0]->FileName;
28782878
for (unsigned I = 1; I < ImportStack.size(); ++I)
2879-
Diag(diag::note_pch_required_by)
2879+
Diag(diag::note_ast_file_required_by)
28802880
<< ImportStack[I-1]->FileName << ImportStack[I]->FileName;
28812881
}
28822882

2883-
Diag(diag::note_pch_rebuild_required) << TopLevelPCHName;
2883+
Diag(diag::note_ast_file_rebuild_required) << TopLevelASTFileName;
28842884
}
28852885

28862886
IsOutOfDate = true;

clang/test/Modules/module-file-modified.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
#include "a.h"
99
int foo = 0; // redefinition of 'foo'
1010
// CHECK: fatal error: file {{.*}} has been modified since the module file {{.*}} was built
11+
// CHECK: note: please rebuild precompiled file
1112
// REQUIRES: shell

clang/test/Modules/validate-file-content.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// CHECK: file '[[M_H:.*[/\\]m\.h]]' has been modified since the precompiled header '[[A_PCH:.*/a\.pch]]' was built: content changed
3030
// CHECK: '[[M_H]]' required by '[[M_PCM:.*[/\\]m.*\.pcm]]'
3131
// CHECK: '[[M_PCM]]' required by '[[A_PCH]]'
32-
// CHECK: please rebuild precompiled header '[[A_PCH]]'
32+
// CHECK: please rebuild precompiled file '[[A_PCH]]'
3333
// expected-no-diagnostics

clang/test/PCH/modified-module-dependency.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
// CHECK: file '[[TEST_H:.*[/\\]test\.h]]' has been modified since the precompiled header '[[PREFIX_PCH:.*/prefix\.pch]]' was built
1818
// CHECK: '[[TEST_H]]' required by '[[TEST_PCM:.*[/\\]test\.pcm]]'
1919
// CHECK: '[[TEST_PCM]]' required by '[[PREFIX_PCH]]'
20-
// CHECK: please rebuild precompiled header '[[PREFIX_PCH]]'
20+
// CHECK: please rebuild precompiled file '[[PREFIX_PCH]]'

clang/test/PCH/validate-file-content.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
// RUN: FileCheck %s < %t/stderr
2626
//
2727
// CHECK: file '[[M_H:.*[/\\]m\.h]]' has been modified since the precompiled header '[[A_PCH:.*/a\.pch]]' was built: content changed
28-
// CHECK: please rebuild precompiled header '[[A_PCH]]'
28+
// CHECK: please rebuild precompiled file '[[A_PCH]]'
2929
// expected-no-diagnostics

0 commit comments

Comments
 (0)