diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 4 | ||||
| -rw-r--r-- | test/SemaObjC/boxing-illegal.m (renamed from test/SemaObjC/boxing-illegal-types.m) | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index e1b9950eca..840a71461e 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -547,7 +547,7 @@ ExprResult Sema::UsualUnaryConversions(Expr *E) { // First, convert to an r-value. ExprResult Res = DefaultFunctionArrayLvalueConversion(E); if (Res.isInvalid()) - return Owned(E); + return ExprError(); E = Res.take(); QualType Ty = E->getType(); @@ -598,7 +598,7 @@ ExprResult Sema::DefaultArgumentPromotion(Expr *E) { ExprResult Res = UsualUnaryConversions(E); if (Res.isInvalid()) - return Owned(E); + return ExprError(); E = Res.take(); // If this is a 'float' or '__fp16' (CVR qualified or typedef) promote to diff --git a/test/SemaObjC/boxing-illegal-types.m b/test/SemaObjC/boxing-illegal.m index ad45b11f2d..59b5c8b710 100644 --- a/test/SemaObjC/boxing-illegal-types.m +++ b/test/SemaObjC/boxing-illegal.m @@ -56,3 +56,20 @@ void testEnum(void *p) { box = @(ME_foo); box = @(*(enum ForwE*)p); // expected-error {{incomplete type 'enum ForwE' used in a boxed expression}} } + +// rdar://13333205 +@class NSMutableDictionary; + +@interface NSMutableArray ++ (NSMutableArray*) array; +@end + +NSMutableDictionary* mBars; + +__attribute((objc_root_class)) @interface rdar13333205 @end + +@implementation rdar13333205 +- (void) insertBar:(id)preset ofKind:(id) kind atIndex:(int)index { + NSMutableArray* presetArray = mBars[kind] ?: [NSMutableArray array]; // expected-error {{expected method to read dictionary element not found on object of type 'NSMutableDictionary *'}} +} +@end |