Fix <rdar://problem/6499801> clang does not detect objc type mismatch in conditional expr
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64393 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 8c3a0a9..628f233 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2245,9 +2245,8 @@
// incompatible then make sure to use 'id' as the composite
// type so the result is acceptable for sending messages to.
- // FIXME: This code should not be localized to here. Also this
- // should use a compatible check instead of abusing the
- // canAssignObjCInterfaces code.
+ // FIXME: Consider unifying with 'areComparableObjCPointerTypes'.
+ // It could return the composite type.
const ObjCInterfaceType* LHSIface = lhptee->getAsObjCInterfaceType();
const ObjCInterfaceType* RHSIface = rhptee->getAsObjCInterfaceType();
if (LHSIface && RHSIface &&
@@ -2258,11 +2257,11 @@
compositeType = rexT;
} else if (Context.isObjCIdStructType(lhptee) ||
Context.isObjCIdStructType(rhptee)) {
- // FIXME: This code looks wrong, because isObjCIdStructType checks
- // the struct but getObjCIdType returns the pointer to
- // struct. This is horrible and should be fixed.
compositeType = Context.getObjCIdType();
} else {
+ Diag(questionLoc, diag::ext_typecheck_comparison_of_distinct_pointers)
+ << lexT << rexT
+ << lex->getSourceRange() << rex->getSourceRange();
QualType incompatTy = Context.getObjCIdType();
ImpCastExprToType(lex, incompatTy);
ImpCastExprToType(rex, incompatTy);