summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-10-27 23:02:38 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-10-27 23:02:38 +0000
commitef8b8ce2074bd868bf338e297f6feacca8f2bb1f (patch)
tree8fac56adc0d8f3cb91cd4cf7d3e6e943dbca3d49 /clang/lib/Sema
parent5607d2cb5410c2e0059d25dc066fb8d2049e9a81 (diff)
downloadbcm5719-llvm-ef8b8ce2074bd868bf338e297f6feacca8f2bb1f.tar.gz
bcm5719-llvm-ef8b8ce2074bd868bf338e297f6feacca8f2bb1f.zip
Type of a conditional expression with two distinct objective-c
class pointer is the most derived common class of the two. This is <rdar://problem/7334235>. llvm-svn: 85337
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaExpr.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index f4e58f07f8c..12f1f513d4f 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -3525,7 +3525,10 @@ QualType Sema::CheckConditionalOperands(Expr *&Cond, Expr *&LHS, Expr *&RHS,
compositeType = Context.getObjCIdType();
} else if (LHSTy->isObjCIdType() || RHSTy->isObjCIdType()) {
compositeType = Context.getObjCIdType();
- } else {
+ } else if (!(compositeType =
+ Context.areCommonBaseCompatible(LHSOPT, RHSOPT)).isNull())
+ ;
+ else {
Diag(QuestionLoc, diag::ext_typecheck_cond_incompatible_operands)
<< LHSTy << RHSTy
<< LHS->getSourceRange() << RHS->getSourceRange();
OpenPOWER on IntegriCloud