diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-01-26 17:08:50 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-01-26 17:08:50 +0000 |
| commit | 419636316c04d570c183b4797fc811932c588358 (patch) | |
| tree | 58209a43a0069ce1dde6cc94c57b6dee14864139 /lib/AST/ASTContext.cpp | |
| parent | 5fe31228c883040cf016cfc71ad4bfeba462602e (diff) | |
objc: 'id' and block pointer compare in mergeTypes is
made symmetrical. // rdar://10734265
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149065 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ASTContext.cpp')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 5a7a73d3e8..295489f489 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -5934,9 +5934,12 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS, 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(); } |