diff options
| -rw-r--r-- | lib/AST/ExprClassification.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenObjCXX/property-objects.mm | 19 | ||||
| -rw-r--r-- | test/SemaObjCXX/propert-dot-error.mm | 21 |
4 files changed, 44 insertions, 1 deletions
diff --git a/lib/AST/ExprClassification.cpp b/lib/AST/ExprClassification.cpp index d7e38ebbf5..8ec81943b3 100644 --- a/lib/AST/ExprClassification.cpp +++ b/lib/AST/ExprClassification.cpp @@ -420,7 +420,8 @@ static Cl::ModifiableType IsModifiable(ASTContext &Ctx, const Expr *E, // Records with any const fields (recursively) are not modifiable. if (const RecordType *R = CT->getAs<RecordType>()) { - assert(!Ctx.getLangOptions().CPlusPlus && + assert((isa<ObjCImplicitSetterGetterRefExpr>(E) || + !Ctx.getLangOptions().CPlusPlus) && "C++ struct assignment should be resolved by the " "copy assignment operator."); if (R->hasConstFields()) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 6b3556cbaa..1836482fd8 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -6685,6 +6685,8 @@ ExprResult Sema::BuildBinOp(Scope *S, SourceLocation OpLoc, BinaryOperatorKind Opc, Expr *lhs, Expr *rhs) { if (getLangOptions().CPlusPlus && + (!isa<ObjCImplicitSetterGetterRefExpr>(lhs) || + rhs->isTypeDependent()) && (lhs->getType()->isOverloadableType() || rhs->getType()->isOverloadableType())) { // Find all of the overloaded operators visible from this diff --git a/test/CodeGenObjCXX/property-objects.mm b/test/CodeGenObjCXX/property-objects.mm index 724cf68268..8e98b0dae7 100644 --- a/test/CodeGenObjCXX/property-objects.mm +++ b/test/CodeGenObjCXX/property-objects.mm @@ -57,3 +57,22 @@ int main() { return 0; } +// rdar://8379892 +// CHECK: define void @_Z1fP1A +// CHECK: @objc_msgSend to void +struct X { + X(); + X(const X&); + ~X(); +}; + +@interface A { + X xval; +} +- (X)x; +- (void)setX:(X)x; +@end + +void f(A* a) { + a.x = X(); +} diff --git a/test/SemaObjCXX/propert-dot-error.mm b/test/SemaObjCXX/propert-dot-error.mm new file mode 100644 index 0000000000..3113e17283 --- /dev/null +++ b/test/SemaObjCXX/propert-dot-error.mm @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s +// rdar: // 8379892 + +struct X { + X(); + X(const X&); + ~X(); +}; + +@interface A { + X xval; +} + +- (X)x; +- (void)setx:(X)x; +@end + +void f(A* a) { + a.x = X(); // expected-error {{setter method is needed to assign to object using property assignment syntax}} +} + |