diff options
-rw-r--r-- | lib/AST/ODRHash.cpp | 30 | ||||
-rw-r--r-- | test/Modules/odr_hash.cpp | 37 |
2 files changed, 63 insertions, 4 deletions
diff --git a/lib/AST/ODRHash.cpp b/lib/AST/ODRHash.cpp index 4f4ea67d32..9d484bd5de 100644 --- a/lib/AST/ODRHash.cpp +++ b/lib/AST/ODRHash.cpp @@ -703,14 +703,36 @@ public: void VisitType(const Type *T) {} void VisitAdjustedType(const AdjustedType *T) { - AddQualType(T->getOriginalType()); - AddQualType(T->getAdjustedType()); + QualType Original = T->getOriginalType(); + QualType Adjusted = T->getAdjustedType(); + + // The original type and pointee type can be the same, as in the case of + // function pointers decaying to themselves. Set a bool and only process + // the type once, to prevent doubling the work. + SplitQualType split = Adjusted.split(); + if (auto Pointer = dyn_cast<PointerType>(split.Ty)) { + if (Pointer->getPointeeType() == Original) { + Hash.AddBoolean(true); + ID.AddInteger(split.Quals.getAsOpaqueValue()); + AddQualType(Original); + VisitType(T); + return; + } + } + + // The original type and pointee type are different, such as in the case + // of a array decaying to an element pointer. Set a bool to false and + // process both types. + Hash.AddBoolean(false); + AddQualType(Original); + AddQualType(Adjusted); + VisitType(T); } void VisitDecayedType(const DecayedType *T) { - AddQualType(T->getDecayedType()); - AddQualType(T->getPointeeType()); + // getDecayedType and getPointeeType are derived from getAdjustedType + // and don't need to be separately processed. VisitAdjustedType(T); } diff --git a/test/Modules/odr_hash.cpp b/test/Modules/odr_hash.cpp index e4c5ba6f82..f22a8b8f8a 100644 --- a/test/Modules/odr_hash.cpp +++ b/test/Modules/odr_hash.cpp @@ -4587,6 +4587,43 @@ int num = bar(); #endif } +namespace FunctionProtoTypeDecay { +#if defined(FIRST) +struct S1 { + struct X {}; + using Y = X(X()); +}; +#elif defined(SECOND) +struct S1 { + struct X {}; + using Y = X(X(X())); +}; +#else +S1 s1; +// expected-error@first.h:* {{'FunctionProtoTypeDecay::S1::Y' from module 'FirstModule' is not present in definition of 'FunctionProtoTypeDecay::S1' in module 'SecondModule'}} +// expected-note@second.h:* {{declaration of 'Y' does not match}} +#endif + +#if defined(FIRST) +struct S2 { + struct X {}; + using Y = + X(X(X(X(X(X(X(X(X(X(X(X(X(X(X(X( + X(X(X(X(X(X(X(X(X(X(X(X(X(X(X(X( + X(X(X(X(X(X(X(X(X(X(X(X(X(X(X(X( + X(X(X(X(X(X(X(X(X(X(X(X(X(X(X(X( + )))))))))))))))) + )))))))))))))))) + )))))))))))))))) + )))))))))))))))); +}; +#elif defined(SECOND) +#else +S2 s2; +#endif + +} + // Keep macros contained to one file. #ifdef FIRST #undef FIRST |