diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticKinds.def | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 9 | ||||
| -rw-r--r-- | test/SemaCXX/decl-expr-ambiguity.cpp | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def index d427e69ac7..81f30e4540 100644 --- a/include/clang/Basic/DiagnosticKinds.def +++ b/include/clang/Basic/DiagnosticKinds.def @@ -1086,8 +1086,6 @@ DIAG(err_typecheck_no_member, ERROR, "no member named '%0'") DIAG(err_typecheck_illegal_increment_decrement, ERROR, "cannot modify value of type '%0'") -DIAG(err_typecheck_invalid_lvalue_incr_decr, ERROR, - "invalid lvalue in increment/decrement expression") DIAG(err_typecheck_arithmetic_incomplete_type, ERROR, "arithmetic on pointer to incomplete type '%0'") DIAG(err_typecheck_decl_incomplete_type, ERROR, diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 1abc5a31df..61b6f7e577 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -2368,7 +2368,7 @@ static bool CheckForModifiableLvalue(Expr *E, SourceLocation Loc, Sema &S) { } if (NeedType) - S.Diag(Loc, Diag, E->getType().getAsString(), SR); + S.Diag(Loc, Diag, E->getType().getAsString(), E->getSourceRange()); else S.Diag(Loc, Diag, E->getSourceRange()); return true; @@ -2463,13 +2463,8 @@ QualType Sema::CheckIncrementDecrementOperand(Expr *op, SourceLocation OpLoc) { } // At this point, we know we have a real, complex or pointer type. // Now make sure the operand is a modifiable lvalue. - Expr::isModifiableLvalueResult mlval = op->isModifiableLvalue(Context); - if (mlval != Expr::MLV_Valid) { - // FIXME: emit a more precise diagnostic... - Diag(OpLoc, diag::err_typecheck_invalid_lvalue_incr_decr, - op->getSourceRange()); + if (CheckForModifiableLvalue(op, OpLoc, *this)) return QualType(); - } return resType; } diff --git a/test/SemaCXX/decl-expr-ambiguity.cpp b/test/SemaCXX/decl-expr-ambiguity.cpp index 5a76b93342..1d69060658 100644 --- a/test/SemaCXX/decl-expr-ambiguity.cpp +++ b/test/SemaCXX/decl-expr-ambiguity.cpp @@ -7,8 +7,8 @@ void f() { // Expressions. T(a)->m = 7; - int(a)++; // expected-error {{invalid lvalue in increment/decrement expression}} - __extension__ int(a)++; // expected-error {{invalid lvalue in increment/decrement expression}} + int(a)++; // expected-error {{expression is not assignable}} + __extension__ int(a)++; // expected-error {{expression is not assignable}} typeof(int)(a,5)<<a; // expected-error {{function-style cast to a builtin type can only take one argument}} void(a), ++a; // expected-warning {{statement was disambiguated as expression}} expected-warning {{expression result unused}} if (int(a)+1) {} |