diff options
Diffstat (limited to 'include/clang/Basic/DiagnosticSerializationKinds.td')
| -rw-r--r-- | include/clang/Basic/DiagnosticSerializationKinds.td | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/include/clang/Basic/DiagnosticSerializationKinds.td b/include/clang/Basic/DiagnosticSerializationKinds.td index 81509cc18821..be9d2bdbd2de 100644 --- a/include/clang/Basic/DiagnosticSerializationKinds.td +++ b/include/clang/Basic/DiagnosticSerializationKinds.td @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// let Component = "Serialization" in { +let CategoryName = "AST Deserialization Issue" in { def err_fe_unable_to_read_pch_file : Error< "unable to read PCH file %0: '%1'">; @@ -22,6 +23,8 @@ def err_fe_pch_file_modified : Error< 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'">; +def note_pch_rebuild_required : Note<"please rebuild precompiled header '%0'">; def note_module_cache_path : Note< "after modifying system headers, please delete the module cache at '%0'">; @@ -36,16 +39,23 @@ def err_pch_langopt_mismatch : Error<"%0 was %select{disabled|enabled}1 in " "PCH file but is currently %select{disabled|enabled}2">; def err_pch_langopt_value_mismatch : Error< "%0 differs in PCH file vs. current file">; +def err_pch_diagopt_mismatch : Error<"%0 is currently enabled, but was not in " + "the PCH file">; -def warn_pch_version_too_old : Error< +def err_pch_version_too_old : Error< "PCH file uses an older PCH format that is no longer supported">; -def warn_pch_version_too_new : Error< +def err_pch_version_too_new : Error< "PCH file uses a newer PCH format that cannot be read">; -def warn_pch_different_branch : Error< +def err_pch_different_branch : Error< "PCH file built from a different branch (%0) than the compiler (%1)">; def err_pch_with_compiler_errors : Error< "PCH file contains compiler errors">; - + +def err_imported_module_not_found : Error< + "module '%0' imported by AST file '%1' not found">, DefaultFatal; +def err_imported_module_modmap_changed : Error< + "module '%0' imported by AST file '%1' found in a different module map file" + " (%2) than when the importing AST file was built (%3)">, DefaultFatal; def warn_module_conflict : Warning< "module '%0' conflicts with already-imported module '%1': %2">, InGroup<ModuleConflict>; @@ -75,5 +85,14 @@ def note_module_odr_violation_no_possible_decls : Note< "definition has no member %0">; def note_module_odr_violation_possible_decl : Note< "declaration of %0 does not match">; +def err_module_odr_violation_different_definitions : Error< + "%q0 has different definitions in different modules; " + "%select{definition in module '%2' is here|defined here}1">; +def note_module_odr_violation_different_definitions : Note< + "definition in module '%0' is here">; +def err_module_odr_violation_different_instantiations : Error< + "instantiation of %q0 is different in different modules">; + +} // let CategoryName +} // let Component -} |