Add support for finding composite type of twp objective-c pointers
in objective-c++ mode.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91059 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 5e0ce66..6d991b6 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -1806,6 +1806,11 @@
QualType Composite = FindCompositePointerType(LHS, RHS);
if (!Composite.isNull())
return Composite;
+
+ // Similarly, attempt to find composite type of twp objective-c pointers.
+ Composite = FindCompositeObjCPointerType(LHS, RHS, QuestionLoc);
+ if (!Composite.isNull())
+ return Composite;
// Fourth bullet is same for pointers-to-member. However, the possible
// conversions are far more limited: we have null-to-pointer, upcast of