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

Sema: handle additional case of qualified types 

A second instance of attributed types escaped the previous change, identified
thanks to Richard Smith!  When deducing the void case, we would also assume that
the type would not be attributed.  Furthermore, properly handle multiple
attributes being applied to a single TypeLoc.

Properly handle this case and future-proof a bit by ignoring parenthesis
further.  The test cases do use the additional parenthesis to ensure that this
case remains properly handled.

Addresses post-commit review comments from Richard Smith to SVN r219851.

llvm-svn: 219974
This commit is contained in:
Saleem Abdulrasool 2014-10-16 22:42:53 +00:00
parent 83e7f68d39
commit 374b5aa170
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Sema/Sema.h
View File

@ -6104,6 +6104,8 @@ public:
bool DeduceReturnType(FunctionDecl *FD, SourceLocation Loc,
bool Diagnose = true);
TypeLoc getReturnTypeLoc(FunctionDecl *FD) const;
bool DeduceFunctionTypeFromReturnExpr(FunctionDecl *FD,
SourceLocation ReturnLoc,
Expr *&RetExpr, AutoType *AT);

3
clang/lib/Sema/SemaDecl.cpp
View File

@ -10414,8 +10414,7 @@ Decl *Sema::ActOnFinishFunctionBody(Decl *dcl, Stmt *Body,
FD->setInvalidDecl();
} else {
// Substitute 'void' for the 'auto' in the type.
TypeLoc ResultType = FD->getTypeSourceInfo()->getTypeLoc().
IgnoreParens().castAs<FunctionProtoTypeLoc>().getReturnLoc();
TypeLoc ResultType = getReturnTypeLoc(FD);
Context.adjustDeducedFunctionResultType(
FD, SubstAutoType(ResultType.getType(), Context.VoidTy));
}

13
clang/lib/Sema/SemaStmt.cpp
View File

@ -2755,17 +2755,20 @@ bool LocalTypedefNameReferencer::VisitRecordType(const RecordType *RT) {
}
}
TypeLoc Sema::getReturnTypeLoc(FunctionDecl *FD) const {
TypeLoc TL = FD->getTypeSourceInfo()->getTypeLoc();
while (auto ATL = TL.getAs<AttributedTypeLoc>())
TL = ATL.getModifiedLoc().IgnoreParens();
return TL.IgnoreParens().castAs<FunctionProtoTypeLoc>().getReturnLoc();
}
/// Deduce the return type for a function from a returned expression, per
/// C++1y [dcl.spec.auto]p6.
bool Sema::DeduceFunctionTypeFromReturnExpr(FunctionDecl *FD,
SourceLocation ReturnLoc,
Expr *&RetExpr,
AutoType *AT) {
TypeLoc TL = FD->getTypeSourceInfo()->getTypeLoc();
if (auto ATL = TL.getAs<AttributedTypeLoc>())
TL = ATL.getModifiedLoc();
TypeLoc OrigResultType =
TL.IgnoreParens().castAs<FunctionProtoTypeLoc>().getReturnLoc();
TypeLoc OrigResultType = getReturnTypeLoc(FD);
QualType Deduced;
if (RetExpr && isa<InitListExpr>(RetExpr)) {

14
clang/test/SemaCXX/attributed-auto-deduction.cpp
View File

@ -2,9 +2,19 @@
// expected-no-diagnostics
void deduce() {
auto lambda = [](int i) __attribute__ (( pcs("aapcs") )) {
auto single_int = [](int i) __attribute__ (( pcs("aapcs") )) {
return i;
};
lambda(42);
auto multiple_int = [](int i) __attribute__ (( pcs("aapcs") ))
__attribute__ (( pcs("aapcs") )) {
return i;
};
auto single_void = []() __attribute__ (( pcs("aapcs") )) { };
auto multiple_void = []() __attribute__ (( pcs("aapcs") ))
__attribute__ (( pcs("aapcs") )) { };
}
auto ( __attribute__ (( pcs("aapcs") )) single_attribute() ) { }
auto ( ( __attribute__ (( pcs("aapcs") )) ( ( __attribute__ (( pcs("aapcs") )) multiple_attributes() ) ) ) ) { }