Fix <rdar://problem/6499801> clang does not detect objc type mismatch in conditional expr
llvm-svn: 64393
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 8c3a0a9..628f233d 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/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);
diff --git a/clang/test/SemaObjC/conditional-expr-2.m b/clang/test/SemaObjC/conditional-expr-2.m
index d8a2663..260482a 100644
--- a/clang/test/SemaObjC/conditional-expr-2.m
+++ b/clang/test/SemaObjC/conditional-expr-2.m
@@ -8,5 +8,22 @@
void f0(int cond, A *a, B *b) {
// Ensure that we can still send a message to result of incompatible
// conditional expression.
- [ (cond ? a : b) test ]; // expected-warning {{method '-test' not found}}
+ [ (cond ? a : b) test ]; // expected-warning{{comparison of distinct pointer types ('A *' and 'B *')}} expected-warning {{method '-test' not found}}
+}
+
+@interface NSKey @end
+@interface KeySub : NSKey @end
+
+@interface UpdatesList @end
+
+void foo (int i, NSKey *NSKeyValueCoding_NullValue, UpdatesList *nukedUpdatesList)
+{
+ id obj;
+ NSKey *key;
+ KeySub *keysub;
+
+ obj = i ? NSKeyValueCoding_NullValue : nukedUpdatesList; // expected-warning{{comparison of distinct pointer types ('NSKey *' and 'UpdatesList *')}}
+ key = i ? NSKeyValueCoding_NullValue : nukedUpdatesList; // expected-warning{{comparison of distinct pointer types ('NSKey *' and 'UpdatesList *')}}
+ key = i ? NSKeyValueCoding_NullValue : keysub;
+ keysub = i ? NSKeyValueCoding_NullValue : keysub; // expected-warning{{incompatible pointer types assigning 'NSKey *', expected 'KeySub *'}}
}