diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2009-12-10 20:46:08 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-12-10 20:46:08 +0000 |
| commit | 798d2bd546254c01be72112b2805eebfc04e121f (patch) | |
| tree | 873987ba34785a2a3d38c62df9af18d36fa3652f /clang/lib | |
| parent | 9f8ca58e30139c6d71a50223b4f1dac45031bc6c (diff) | |
| download | bcm5719-llvm-798d2bd546254c01be72112b2805eebfc04e121f.tar.gz bcm5719-llvm-798d2bd546254c01be72112b2805eebfc04e121f.zip | |
Add support for finding composite type of twp objective-c pointers
in objective-c++ mode.
llvm-svn: 91059
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 5e0ce666ea2..6d991b6a7c6 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1806,6 +1806,11 @@ QualType Sema::CXXCheckConditionalOperands(Expr *&Cond, Expr *&LHS, Expr *&RHS, 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 |
