Skip to content

Commit

Permalink
[Sema] Fix assertion when auto parameter in lambda has an attribute.
Browse files Browse the repository at this point in the history
Fixes the assertion
> no Attr* for AttributedType*
> UNREACHABLE executed at llvm-project/clang/lib/Sema/SemaType.cpp:298!

In `TypeProcessingState::getAttributedType` we put into `AttrsForTypes`
types with `auto` but later in
`TypeProcessingState::takeAttrForAttributedType` we use transformed
types and that's why cannot find `Attr` corresponding to
`AttributedType`.

Fix by keeping `AttrsForTypes` up to date after replacing `AutoType`.

rdar://problem/47689465

Reviewers: rsmith, arphaman, aaron.ballman

Reviewed By: aaron.ballman

Subscribers: jkorous, dexonsmith, jdoerfert, cfe-commits

Differential Revision: https://reviews.llvm.org/D58659

llvm-svn: 357298
  • Loading branch information
vsapsai committed Mar 29, 2019
1 parent 4ccb3b9 commit 9e911f3
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
19 changes: 18 additions & 1 deletion clang/lib/Sema/SemaType.cpp
Expand Up @@ -255,6 +255,23 @@ namespace {
return T;
}

/// Completely replace the \c auto in \p TypeWithAuto by
/// \p Replacement. Also replace \p TypeWithAuto in \c TypeAttrPair if
/// necessary.
QualType ReplaceAutoType(QualType TypeWithAuto, QualType Replacement) {
QualType T = sema.ReplaceAutoType(TypeWithAuto, Replacement);
if (auto *AttrTy = TypeWithAuto->getAs<AttributedType>()) {
// Attributed type still should be an attributed type after replacement.
auto *NewAttrTy = cast<AttributedType>(T.getTypePtr());
for (TypeAttrPair &A : AttrsForTypes) {
if (A.first == AttrTy)
A.first = NewAttrTy;
}
AttrsForTypesSorted = false;
}
return T;
}

/// Extract and remove the Attr* for a given attributed type.
const Attr *takeAttrForAttributedType(const AttributedType *AT) {
if (!AttrsForTypesSorted) {
Expand Down Expand Up @@ -2938,7 +2955,7 @@ static QualType GetDeclSpecTypeForDeclarator(TypeProcessingState &state,
// template type parameter.
// FIXME: Retain some type sugar to indicate that this was written
// as 'auto'.
T = SemaRef.ReplaceAutoType(
T = state.ReplaceAutoType(
T, QualType(CorrespondingTemplateParam->getTypeForDecl(), 0));
}
break;
Expand Down
8 changes: 8 additions & 0 deletions clang/test/SemaCXX/auto-cxx0x.cpp
Expand Up @@ -15,3 +15,11 @@ void g() {
// expected-error@-2 {{'auto' not allowed in lambda parameter}}
#endif
}

void rdar47689465() {
int x = 0;
[](auto __attribute__((noderef)) *){}(&x);
#if __cplusplus == 201103L
// expected-error@-2 {{'auto' not allowed in lambda parameter}}
#endif
}

0 comments on commit 9e911f3

Please sign in to comment.