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

[ODRHash diagnostics] Fix typos. NFC.

This commit is contained in:
Volodymyr Sapsai 2022-06-29 14:59:21 -07:00
parent f702c7bb9e
commit 3514131219
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,7 +355,7 @@ def err_module_odr_violation_enum : Error<
"enum with specified type %4|"
"enum with %4 element%s4|"
"%ordinal4 element has name %5|"
"%ordinal4 element %5 %select{has|does not have}6 an initilizer|"
"%ordinal4 element %5 %select{has|does not have}6 an initializer|"
"%ordinal4 element %5 has an initializer|"
"}3">;

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

@ -10636,7 +10636,7 @@ void ASTReader::diagnoseOdrViolations() {
// Compare the hash generated to the hash stored. A difference means
// that a body was present in the original source. Due to merging,
// the stardard way of detecting a body will not work.
// the standard way of detecting a body will not work.
const bool HasFirstBody =
ComputeCXXMethodODRHash(FirstMethod) != FirstMethod->getODRHash();
const bool HasSecondBody =
@ -11166,8 +11166,8 @@ void ASTReader::diagnoseOdrViolations() {
DifferentSpecifiedTypes,
DifferentNumberEnumConstants,
EnumConstantName,
EnumConstantSingleInitilizer,
EnumConstantDifferentInitilizer,
EnumConstantSingleInitializer,
EnumConstantDifferentInitializer,
};
// If we've already pointed out a specific problem with this enum, don't
@ -11301,18 +11301,18 @@ void ASTReader::diagnoseOdrViolations() {
continue;
if (!FirstInit || !SecondInit) {
ODRDiagError(FirstEnumConstant, EnumConstantSingleInitilizer)
ODRDiagError(FirstEnumConstant, EnumConstantSingleInitializer)
<< I + 1 << FirstEnumConstant << (FirstInit != nullptr);
ODRDiagNote(SecondEnumConstant, EnumConstantSingleInitilizer)
ODRDiagNote(SecondEnumConstant, EnumConstantSingleInitializer)
<< I + 1 << SecondEnumConstant << (SecondInit != nullptr);
Diagnosed = true;
break;
}
if (ComputeODRHash(FirstInit) != ComputeODRHash(SecondInit)) {
ODRDiagError(FirstEnumConstant, EnumConstantDifferentInitilizer)
ODRDiagError(FirstEnumConstant, EnumConstantDifferentInitializer)
<< I + 1 << FirstEnumConstant;
ODRDiagNote(SecondEnumConstant, EnumConstantDifferentInitilizer)
ODRDiagNote(SecondEnumConstant, EnumConstantDifferentInitializer)
<< I + 1 << SecondEnumConstant;
Diagnosed = true;
break;

4
clang/test/Modules/odr_hash.cpp
View File

@ -3300,7 +3300,7 @@ enum E7 { x71 = 0 };
enum E7 { x71 };
#else
E7 e7;
// expected-error@second.h:* {{'Enums::E7' has different definitions in different modules; definition in module 'SecondModule' first difference is 1st element 'x71' has an initilizer}}
// expected-error@second.h:* {{'Enums::E7' has different definitions in different modules; definition in module 'SecondModule' first difference is 1st element 'x71' has an initializer}}
// expected-note@first.h:* {{but in 'FirstModule' found 1st element 'x71' does not have an initializer}}
#endif
@ -3310,7 +3310,7 @@ enum E8 { x81 };
enum E8 { x81 = 0 };
#else
E8 e8;
// expected-error@second.h:* {{'Enums::E8' has different definitions in different modules; definition in module 'SecondModule' first difference is 1st element 'x81' does not have an initilizer}}
// expected-error@second.h:* {{'Enums::E8' has different definitions in different modules; definition in module 'SecondModule' first difference is 1st element 'x81' does not have an initializer}}
// expected-note@first.h:* {{but in 'FirstModule' found 1st element 'x81' has an initializer}}
#endif