diff options
| -rw-r--r-- | lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp | 4 | ||||
| -rw-r--r-- | test/Analysis/variadic-method-types.m | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp b/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp index 2790a19c61..235b400eb9 100644 --- a/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp +++ b/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp @@ -593,6 +593,10 @@ void VariadicMethodTypeChecker::checkPreObjCMessage(ObjCMessage msg, if (ArgTy->isObjCObjectPointerType()) continue; + // Block pointers are treaded as Objective-C pointers. + if (ArgTy->isBlockPointerType()) + continue; + // Ignore pointer constants. if (isa<loc::ConcreteInt>(msg.getArgSVal(I, state))) continue; diff --git a/test/Analysis/variadic-method-types.m b/test/Analysis/variadic-method-types.m index 76a05ed9c0..018956ab1b 100644 --- a/test/Analysis/variadic-method-types.m +++ b/test/Analysis/variadic-method-types.m @@ -67,6 +67,7 @@ typedef struct BarType * BarType; void f(id a, id<P> b, C* c, C<P> *d, FooType fooType, BarType barType) { [NSArray arrayWithObjects:@"Hello", a, b, c, d, nil]; + [NSArray arrayWithObjects:@"Foo", ^{}, nil]; [NSArray arrayWithObjects:@"Foo", "Bar", "Baz", nil]; // expected-warning 2 {{Argument to 'NSArray' method 'arrayWithObjects:' should be an Objective-C pointer type, not 'char *'}} [NSDictionary dictionaryWithObjectsAndKeys:@"Foo", "Bar", nil]; // expected-warning {{Argument to 'NSDictionary' method 'dictionaryWithObjectsAndKeys:' should be an Objective-C pointer type, not 'char *'}} |