diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 11 | ||||
| -rw-r--r-- | clang/test/SemaObjC/conditional-expr-2.m | 19 |
2 files changed, 23 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 8c3a0a9fa15..628f233d681 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -2245,9 +2245,8 @@ inline QualType Sema::CheckConditionalOperands( // C99 6.5.15 // 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 @@ inline QualType Sema::CheckConditionalOperands( // C99 6.5.15 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 d8a26630937..260482a6da9 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 *'}} } |
