From 51062c1f3e96560c4366f0ed23ea9f04b15a5d69 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Thu, 8 Jun 2017 04:47:29 +0000 Subject: [PATCH] [ODRHash] Make diagnostic message more readable. Change the diagnostic message from r304956 to be less confusing by reordering the flow of information. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@304962 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSerializationKinds.td | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/clang/Basic/DiagnosticSerializationKinds.td b/include/clang/Basic/DiagnosticSerializationKinds.td index e4c9ead0d1..7c9e8c8980 100644 --- a/include/clang/Basic/DiagnosticSerializationKinds.td +++ b/include/clang/Basic/DiagnosticSerializationKinds.td @@ -175,11 +175,13 @@ def note_module_odr_violation_mismatch_decl_diff : Note<"but in '%0' found " "method %2 with %ordinal3 parameter named %4}1">; def err_module_odr_violation_mismatch_decl_unknown : Error< - "%q0 has different definitions in different modules; first difference is " - "%select{definition in module '%2'|defined here}1 found different " - "%select{||||static assert|field|method|other}3">; + "%q0 %select{with definition in module '%2'|defined here}1 has different " + "definitions in different modules; first difference is this " + "%select{||||static assert|field|method|unexpected decl}3">; def note_module_odr_violation_mismatch_decl_unknown : Note< - "but in '%0' found different %select{||||static assert|field|method|other}1">; + "but in '%0' found " + "%select{||||different static assert|different field|different method|" + "another unexpected decl}1">; def warn_duplicate_module_file_extension : Warning< "duplicate module file extension block name '%0'">, -- 2.40.0