diff options
author | Richard Trieu <rtrieu@google.com> | 2017-07-12 00:38:27 +0000 |
---|---|---|
committer | Richard Trieu <rtrieu@google.com> | 2017-07-12 00:38:27 +0000 |
commit | 060026936d3447ed99ed1eeb1e805e40c50ead94 (patch) | |
tree | 4f4e6c27e80101431acc3b0c4c638af2170f2661 /include/clang/Basic | |
parent | 8a8c68590dd0c56538d7ac6c277b734ca981ddb9 (diff) |
[ODRHash] Revert r307720 to fix buildbot.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@307743 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic')
-rw-r--r-- | include/clang/Basic/DiagnosticSerializationKinds.td | 70 |
1 files changed, 24 insertions, 46 deletions
diff --git a/include/clang/Basic/DiagnosticSerializationKinds.td b/include/clang/Basic/DiagnosticSerializationKinds.td index 420ccebbfa..0fc5484858 100644 --- a/include/clang/Basic/DiagnosticSerializationKinds.td +++ b/include/clang/Basic/DiagnosticSerializationKinds.td @@ -147,29 +147,18 @@ def err_module_odr_violation_mismatch_decl_diff : Error< "%select{non-|}5mutable field %4|" "field %4 with %select{no|an}5 initalizer|" "field %4 with an initializer|" - "%select{method %5|constructor|destructor}4|" - "%select{method %5|constructor|destructor}4 " - "is %select{not deleted|deleted}6|" - "%select{method %5|constructor|destructor}4 " - "is %select{|pure }6%select{not virtual|virtual}7|" - "%select{method %5|constructor|destructor}4 " - "is %select{not static|static}6|" - "%select{method %5|constructor|destructor}4 " - "is %select{not volatile|volatile}6|" - "%select{method %5|constructor|destructor}4 " - "is %select{not const|const}6|" - "%select{method %5|constructor|destructor}4 " - "is %select{not inline|inline}6|" - "%select{method %5|constructor|destructor}4 " - "that has %6 parameter%s6|" - "%select{method %5|constructor|destructor}4 " - "with %ordinal6 parameter of type %7%select{| decayed from %9}8|" - "%select{method %5|constructor|destructor}4 " - "with %ordinal6 parameter named %7|" - "%select{method %5|constructor|destructor}4 " - "with %ordinal6 parameter with%select{out|}7 a default argument|" - "%select{method %5|constructor|destructor}4 " - "with %ordinal6 parameter with a default argument|" + "method %4|" + "method %4 is %select{not deleted|deleted}5|" + "method %4 is %select{|pure }5%select{not virtual|virtual}6|" + "method %4 is %select{not static|static}5|" + "method %4 is %select{not volatile|volatile}5|" + "method %4 is %select{not const|const}5|" + "method %4 is %select{not inline|inline}5|" + "method %4 that has %5 parameter%s5|" + "method %4 with %ordinal5 parameter of type %6%select{| decayed from %8}7|" + "method %4 with %ordinal5 parameter named %6|" + "method %4 with %ordinal5 parameter with%select{out|}6 a default argument|" + "method %4 with %ordinal5 parameter with a default argument|" "%select{typedef|type alias}4 name %5|" "%select{typedef|type alias}4 %5 with underlying type %6|" "data member with name %4|" @@ -194,29 +183,18 @@ def note_module_odr_violation_mismatch_decl_diff : Note<"but in '%0' found " "%select{non-|}3mutable field %2|" "field %2 with %select{no|an}3 initializer|" "field %2 with a different initializer|" - "%select{method %3|constructor|destructor}2|" - "%select{method %3|constructor|destructor}2 " - "is %select{not deleted|deleted}4|" - "%select{method %3|constructor|destructor}2 " - "is %select{|pure }4%select{not virtual|virtual}5|" - "%select{method %3|constructor|destructor}2 " - "is %select{not static|static}4|" - "%select{method %3|constructor|destructor}2 " - "is %select{not volatile|volatile}4|" - "%select{method %3|constructor|destructor}2 " - "is %select{not const|const}4|" - "%select{method %3|constructor|destructor}2 " - "is %select{not inline|inline}4|" - "%select{method %3|constructor|destructor}2 " - "that has %4 parameter%s4|" - "%select{method %3|constructor|destructor}2 " - "with %ordinal4 parameter of type %5%select{| decayed from %7}6|" - "%select{method %3|constructor|destructor}2 " - "with %ordinal4 parameter named %5|" - "%select{method %3|constructor|destructor}2 " - "with %ordinal4 parameter with%select{out|}5 a default argument|" - "%select{method %3|constructor|destructor}2 " - "with %ordinal4 parameter with a different default argument|" + "method %2|" + "method %2 is %select{not deleted|deleted}3|" + "method %2 is %select{|pure }3%select{not virtual|virtual}4|" + "method %2 is %select{not static|static}3|" + "method %2 is %select{not volatile|volatile}3|" + "method %2 is %select{not const|const}3|" + "method %2 is %select{not inline|inline}3|" + "method %2 that has %3 parameter%s3|" + "method %2 with %ordinal3 parameter of type %4%select{| decayed from %6}5|" + "method %2 with %ordinal3 parameter named %4|" + "method %2 with %ordinal3 parameter with%select{out|}4 a default argument|" + "method %2 with %ordinal3 parameter with a different default argument|" "%select{typedef|type alias}2 name %3|" "%select{typedef|type alias}2 %3 with different underlying type %4|" "data member with name %2|" |