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

[ODRHash] Fix wrong error message with bitfields and mutable. 

Add a check to bitfield mismatches that may have caused Clang to
give an error about the bitfield instead of being mutable.
This commit is contained in:
Weverything 2020-01-14 21:12:15 -08:00
parent 36eedfcb3c
commit a60e892729
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10094,14 +10094,22 @@ void ASTReader::diagnoseOdrViolations() {
}
if (IsFirstBitField && IsSecondBitField) {
ODRDiagError(FirstField->getLocation(), FirstField->getSourceRange(),
FieldDifferentWidthBitField)
<< FirstII << FirstField->getBitWidth()->getSourceRange();
ODRDiagNote(SecondField->getLocation(), SecondField->getSourceRange(),
FieldDifferentWidthBitField)
<< SecondII << SecondField->getBitWidth()->getSourceRange();
Diagnosed = true;
break;
unsigned FirstBitWidthHash =
ComputeODRHash(FirstField->getBitWidth());
unsigned SecondBitWidthHash =
ComputeODRHash(SecondField->getBitWidth());
if (FirstBitWidthHash != SecondBitWidthHash) {
ODRDiagError(FirstField->getLocation(),
FirstField->getSourceRange(),
FieldDifferentWidthBitField)
<< FirstII << FirstField->getBitWidth()->getSourceRange();
ODRDiagNote(SecondField->getLocation(),
SecondField->getSourceRange(),
FieldDifferentWidthBitField)
<< SecondII << SecondField->getBitWidth()->getSourceRange();
Diagnosed = true;
break;
}
}
const bool IsFirstMutable = FirstField->isMutable();

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

@ -310,6 +310,20 @@ S9 s9;
// expected-note@first.h:* {{but in 'FirstModule' found mutable field 'x'}}
#endif
#if defined(FIRST)
struct S9b {
mutable int x : 2;
};
#elif defined(SECOND)
struct S9b {
int x : 2;
};
#else
S9b s9b;
// expected-error@second.h:* {{'Field::S9b' has different definitions in different modules; first difference is definition in module 'SecondModule' found non-mutable field 'x'}}
// expected-note@first.h:* {{but in 'FirstModule' found mutable field 'x'}}
#endif
#if defined(FIRST)
struct S10 {
unsigned x = 5;
@ -372,7 +386,9 @@ S13 s13;
unsigned c : 1 + 2; \
s d; \
double e = 1.0; \
long f[5];
long f[5]; \
mutable int g; \
mutable int h : 5;
#if defined(FIRST) || defined(SECOND)
typedef short s;