diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/ExprClassification.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 |
2 files changed, 4 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 |