diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 8 | ||||
| -rw-r--r-- | test/Sema/conditional-expr.m | 21 |
2 files changed, 28 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 500d5b7786..f75c3924a0 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -972,7 +972,13 @@ inline QualType Sema::CheckConditionalOperands( // C99 6.5.15 return compositeType; } } - + // Need to handle "id<xx>" explicitly. Unlike "id", whose canonical type + // evaluates to "struct objc_object *" (and is handled above when comparing + // id with statically typed objects). FIXME: Do we need an ImpCastExprToType? + if (lexT->isObjCQualifiedIdType() || rexT->isObjCQualifiedIdType()) { + if (ObjCQualifiedIdTypesAreCompatible(lexT, rexT, true)) + return Context.getObjCIdType(); + } // Otherwise, the operands are not compatible. Diag(questionLoc, diag::err_typecheck_cond_incompatible_operands, lexT.getAsString(), rexT.getAsString(), diff --git a/test/Sema/conditional-expr.m b/test/Sema/conditional-expr.m new file mode 100644 index 0000000000..d2620416fd --- /dev/null +++ b/test/Sema/conditional-expr.m @@ -0,0 +1,21 @@ +// RUN: clang -fsyntax-only -verify -pedantic %s +@protocol NSObject +@end + +@protocol DTOutputStreams <NSObject> +@end + +@interface DTFilterOutputStream <DTOutputStreams> +- nextOutputStream; +@end + +@implementation DTFilterOutputStream +- (id)initWithNextOutputStream:(id <DTOutputStreams>) outputStream { + id <DTOutputStreams> nextOutputStream = [self nextOutputStream]; + self = nextOutputStream; + return nextOutputStream ? nextOutputStream : self; +} +- nextOutputStream { + return self; +} +@end |