[cfe-commits] r149007 - in /cfe/trunk: lib/AST/ASTContext.cpp test/SemaObjC/block-id-as-block-argtype.m

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Jan 25 18:45:38 2012
New Revision: 149007

URL: http://llvm.org/viewvc/llvm-project?rev=149007&view=rev
Log:
objc: allow block pointer matching 'id' type when
they show up as argument types of two block pointers.
// rdar://10734265

Added:
    cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m
Modified:
    cfe/trunk/lib/AST/ASTContext.cpp

Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=149007&r1=149006&r2=149007&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Wed Jan 25 18:45:38 2012
@@ -5933,7 +5933,11 @@
       if (ETy->getDecl()->getIntegerType() == LHSCan.getUnqualifiedType())
         return LHS;
     }
-
+    // allow block pointer type to match an 'id' type.
+    if (OfBlockPointer && !BlockReturnType &&
+        LHS->isObjCIdType() && RHS->isBlockPointerType())
+      return LHS;
+    
     return QualType();
   }
 

Added: cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m?rev=149007&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m (added)
+++ cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m Wed Jan 25 18:45:38 2012
@@ -0,0 +1,21 @@
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks
+// rdar://10734265
+
+ at class NSObject;
+typedef void (^block1_t)(int arg);
+typedef void (^block2_t)(block1_t arg);
+typedef void (^block3_t)(NSObject *arg);
+typedef void (^block4_t)(id arg);
+
+void fn(block4_t arg); // expected-note {{passing argument to parameter 'arg' here}}
+
+int main() {
+    block1_t b1;
+    block2_t b2;
+    block3_t b3;
+    block3_t b4;
+    fn(b1);  // expected-error {{incompatible block pointer types passing 'block1_t' (aka 'void (^)(int)') to parameter of type 'block4_t' (aka 'void (^)(id)')}}
+    fn(b2);  // must succeed: block1_t *is* compatible with id
+    fn(b3);  // succeeds: NSObject* compatible with id
+    fn(b4);  // succeeds: id compatible with id
+}