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

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Jan 26 11:08:50 2012
New Revision: 149065

URL: http://llvm.org/viewvc/llvm-project?rev=149065&view=rev
Log:
objc: 'id' and block pointer compare in mergeTypes is
made symmetrical. // rdar://10734265

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

Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=149065&r1=149064&r2=149065&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Thu Jan 26 11:08:50 2012
@@ -5934,9 +5934,12 @@
         return LHS;
     }
     // allow block pointer type to match an 'id' type.
-    if (OfBlockPointer && !BlockReturnType &&
-        LHS->isObjCIdType() && RHS->isBlockPointerType())
-      return LHS;
+    if (OfBlockPointer && !BlockReturnType) {
+       if (LHS->isObjCIdType() && RHS->isBlockPointerType())
+         return LHS;
+      if (RHS->isObjCIdType() && LHS->isBlockPointerType())
+        return RHS;
+    }
     
     return QualType();
   }

Modified: 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=149065&r1=149064&r2=149065&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m (original)
+++ cfe/trunk/test/SemaObjC/block-id-as-block-argtype.m Thu Jan 26 11:08:50 2012
@@ -9,13 +9,19 @@
 
 void fn(block4_t arg); // expected-note {{passing argument to parameter 'arg' here}}
 
+void another_fn(block2_t arg);
+
 int main() {
     block1_t b1;
     block2_t b2;
     block3_t b3;
     block3_t b4;
+    block4_t b5;
+
     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
+
+    another_fn(b5);
 }