maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Serialization: Rename three AST diagnostics, NFC 

All three diagnostics have a select between "PCH", "module", and "AST"
in the text. The most generic of these is "AST", so rename them from
`err_module_...` to `err_ast_...`.

Differential Revision: https://reviews.llvm.org/D91436
This commit is contained in:
Duncan P. N. Exon Smith 2020-11-13 12:00:08 -05:00
parent 67fa016ac1
commit b764a62f02
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Basic/DiagnosticSerializationKinds.td
View File

@ -63,12 +63,12 @@ def err_pch_with_compiler_errors : Error<
def err_module_file_conflict : Error< def err_module_file_conflict : Error<
"module '%0' is defined in both '%1' and '%2'">, DefaultFatal; "module '%0' is defined in both '%1' and '%2'">, DefaultFatal;
def err_module_file_not_found : Error< def err_ast_file_not_found : Error<
"%select{PCH|module|AST}0 file '%1' not found%select{|: %3}2">, DefaultFatal; "%select{PCH|module|AST}0 file '%1' not found%select{|: %3}2">, DefaultFatal;
def err_module_file_out_of_date : Error< def err_ast_file_out_of_date : Error<
"%select{PCH|module|AST}0 file '%1' is out of date and " "%select{PCH|module|AST}0 file '%1' is out of date and "
"needs to be rebuilt%select{|: %3}2">, DefaultFatal; "needs to be rebuilt%select{|: %3}2">, DefaultFatal;
def err_module_file_invalid : Error< def err_ast_file_invalid : Error<
"file '%1' is not a valid precompiled %select{PCH|module|AST}0 file">, DefaultFatal; "file '%1' is not a valid precompiled %select{PCH|module|AST}0 file">, DefaultFatal;
def note_module_file_imported_by : Note< def note_module_file_imported_by : Note<
"imported by %select{|module '%2' in }1'%0'">; "imported by %select{|module '%2' in }1'%0'">;

10
clang/lib/Serialization/ASTReader.cpp
View File

@ -4505,8 +4505,8 @@ ASTReader::ReadASTCore(StringRef FileName,
return Missing; return Missing;
// Otherwise, return an error. // Otherwise, return an error.
Diag(diag::err_module_file_not_found) << moduleKindForDiagnostic(Type) Diag(diag::err_ast_file_not_found)
<< FileName << !ErrorStr.empty() << moduleKindForDiagnostic(Type) << FileName << !ErrorStr.empty()
<< ErrorStr; << ErrorStr;
return Failure; return Failure;
@ -4517,8 +4517,8 @@ ASTReader::ReadASTCore(StringRef FileName,
return OutOfDate; return OutOfDate;
// Otherwise, return an error. // Otherwise, return an error.
Diag(diag::err_module_file_out_of_date) << moduleKindForDiagnostic(Type) Diag(diag::err_ast_file_out_of_date)
<< FileName << !ErrorStr.empty() << moduleKindForDiagnostic(Type) << FileName << !ErrorStr.empty()
<< ErrorStr; << ErrorStr;
return Failure; return Failure;
} }
@ -4540,7 +4540,7 @@ ASTReader::ReadASTCore(StringRef FileName,
// Sniff for the signature. // Sniff for the signature.
if (llvm::Error Err = doesntStartWithASTFileMagic(Stream)) { if (llvm::Error Err = doesntStartWithASTFileMagic(Stream)) {
Diag(diag::err_module_file_invalid) Diag(diag::err_ast_file_invalid)
<< moduleKindForDiagnostic(Type) << FileName << std::move(Err); << moduleKindForDiagnostic(Type) << FileName << std::move(Err);
return Failure; return Failure;
} }