replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ObjC] Fix function signature handling for blocks literals with attributes 

Block literals can have a type with attributes in its signature, e.g.
ns_returns_retained. The code that inspected the type loc of the block when
declaring its parameters didn't account for this fact, and only looked through
paren type loc. This commit ensures that getAsAdjusted is used instead of
IgnoreParens to find the block's FunctionProtoTypeLoc. This ensures that
block parameters are declared correctly in the block and avoids the
'undeclared identifier' error.

rdar://35416160

llvm-svn: 317736
This commit is contained in:
Alex Lorenz 2017-11-08 22:44:34 +00:00
parent 2fd314e2e2
commit 1ee711633d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaExpr.cpp
View File

@ -12859,8 +12859,8 @@ void Sema::ActOnBlockArguments(SourceLocation CaretLoc, Declarator &ParamInfo,
// Look for an explicit signature in that function type.
FunctionProtoTypeLoc ExplicitSignature;
TypeLoc tmp = Sig->getTypeLoc().IgnoreParens();
if ((ExplicitSignature = tmp.getAs<FunctionProtoTypeLoc>())) {
if ((ExplicitSignature =
Sig->getTypeLoc().getAsAdjusted<FunctionProtoTypeLoc>())) {
// Check whether that explicit signature was synthesized by
// GetTypeForDeclarator. If so, don't save that as part of the

15
clang/test/SemaObjC/block-literal-with-attribute.m Normal file
View File

@ -0,0 +1,15 @@
// RUN: %clang_cc1 -fsyntax-only %s -verify -fblocks -fobjc-arc
// RUN: %clang_cc1 -fsyntax-only %s -verify -fblocks
// FIXME: should compile
__auto_type block = ^ id __attribute__((ns_returns_retained)) (id filter) {
return filter; // ok
};
__auto_type block2 = ^ __attribute__((ns_returns_retained)) id (id filter) {
return filter; // ok
};
__auto_type block3 = ^ id (id filter) __attribute__((ns_returns_retained)) {
return filter; // ok
};
// expected-no-diagnostics