diff options
| -rw-r--r-- | clang/lib/Sema/SemaPseudoObject.cpp | 10 | ||||
| -rw-r--r-- | clang/test/SemaObjCXX/properties.mm | 31 |
2 files changed, 41 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaPseudoObject.cpp b/clang/lib/Sema/SemaPseudoObject.cpp index 106250fe0f5..af74f0d4a3e 100644 --- a/clang/lib/Sema/SemaPseudoObject.cpp +++ b/clang/lib/Sema/SemaPseudoObject.cpp @@ -730,6 +730,16 @@ ExprResult ObjCPropertyOpBuilder::buildSet(Expr *op, SourceLocation opcLoc, op = opResult.take(); assert(op && "successful assignment left argument invalid?"); } + else if (OpaqueValueExpr *OVE = dyn_cast<OpaqueValueExpr>(op)) { + Expr *Initializer = OVE->getSourceExpr(); + // passing C++11 style initialized temporaries to objc++ properties + // requires special treatment by removing OpaqueValueExpr so type + // conversion takes place and adding the OpaqueValueExpr later on. + if (isa<InitListExpr>(Initializer) && + Initializer->getType()->isVoidType()) { + op = Initializer; + } + } } // Arguments. diff --git a/clang/test/SemaObjCXX/properties.mm b/clang/test/SemaObjCXX/properties.mm index 36f59b650ce..7bb4fab3d3f 100644 --- a/clang/test/SemaObjCXX/properties.mm +++ b/clang/test/SemaObjCXX/properties.mm @@ -172,3 +172,34 @@ namespace test10 { @implementation PropertyOfItself @synthesize x; @end + +// rdar://14654207 +struct CGSize { + double width; + double height; +}; +typedef struct CGSize CGSize; + +struct CGRect { + CGSize origin; + CGSize size; +}; +typedef struct CGRect CGRect; + +typedef CGRect NSRect; +void HappySetFrame(NSRect frame) {} + +__attribute__((objc_root_class)) +@interface NSObject +@property CGRect frame; +@end + +@implementation NSObject +- (void) nothing +{ + HappySetFrame({{0,0}, {13,14}}); + [self setFrame: {{0,0}, {13,14}}]; + self.frame = {{0,0}, {13,14}}; + self.frame = (CGRect){{3,5}, {13,14}}; +} +@end |
