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

dgregor accidentally killed this assert, but on investigation, it can fire 

on invalid code and we don't really care, so kill it harder.

llvm-svn: 125068
This commit is contained in:
John McCall 2011-02-08 01:59:10 +00:00
parent 2da6d49523
commit 653dac4b0a
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clang/lib/Sema/SemaType.cpp
View File

@ -486,27 +486,19 @@ static void maybeSynthesizeBlockSignature(TypeProcessingState &state,
return;
}
// If there are any type objects, the type as written won't
// name a function, regardless of the decl spec type. This
// is because a block signature declarator is always an
// abstract-declarator, and abstract-declarators can't just
// be parentheses chunks. Therefore we need to build a function
// chunk unless there are no type objects and the decl spec
// type is a function.
// If there are any type objects, the type as written won't name a
// function, regardless of the decl spec type. This is because a
// block signature declarator is always an abstract-declarator, and
// abstract-declarators can't just be parentheses chunks. Therefore
// we need to build a function chunk unless there are no type
// objects and the decl spec type is a function.
if (!declarator.getNumTypeObjects() && declSpecType->isFunctionType())
return;
#ifndef NDEBUG
if (declarator.getNumTypeObjects()) {
bool isOnlyParens = true;
for (unsigned i = 0, e = declarator.getNumTypeObjects(); i != e; ++i) {
if (declarator.getTypeObject(i).Kind != DeclaratorChunk::Paren) {
isOnlyParens = false;
break;
}
}
}
#endif
// Note that there *are* cases with invalid declarators where
// declarators consist solely of parentheses. In general, these
// occur only in failed efforts to make function declarators, so
// faking up the function chunk is still the right thing to do.
// Otherwise, we need to fake up a function declarator.
SourceLocation loc = declarator.getSourceRange().getBegin();

6
clang/test/Sema/block-args.c
View File

@ -34,3 +34,9 @@ void f0() {
^(int, double d, char) {}(1, 1.34, 'a'); // expected-error {{parameter name omitted}} \
// expected-error {{parameter name omitted}}
}
// rdar://problem/8962770
void test4() {
int (^f)() = ^((x)) { }; // expected-error {{expected ')'}} expected-warning {{type specifier missing}} expected-note {{to match this}}
}