diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticKinds.def | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 13 | ||||
| -rw-r--r-- | clang/test/SemaObjC/foreach-1.m | 10 |
3 files changed, 22 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticKinds.def b/clang/include/clang/Basic/DiagnosticKinds.def index 7e1ccc7f259..914434a7efe 100644 --- a/clang/include/clang/Basic/DiagnosticKinds.def +++ b/clang/include/clang/Basic/DiagnosticKinds.def @@ -489,6 +489,8 @@ DIAG(err_collection_expr_type, ERROR, "collection expression type ('%0') is not a valid object") DIAG(err_selector_element_type, ERROR, "selector element type ('%0') is not a valid object") +DIAG(err_selector_element_not_lvalue, ERROR, + "selector element is not a valid lvalue") DIAG(err_toomany_element_decls, ERROR, "Only one element declaration is allowed") DIAG(warn_expected_implementation, WARNING, diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 619eb772c34..629ab3465dd 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -562,11 +562,18 @@ Sema::ActOnObjCForCollectionStmt(SourceLocation ForLoc, return Diag(VD->getLocation(), diag::err_non_variable_decl_in_for); if (D->getNextDeclarator()) return Diag(D->getLocation(), diag::err_toomany_element_decls); - } else - FirstType = static_cast<Expr*>(first)->getType(); + } else { + Expr::isLvalueResult lval = cast<Expr>(First)->isLvalue(Context); + + if (lval != Expr::LV_Valid) + return Diag(First->getLocStart(), diag::err_selector_element_not_lvalue, + First->getSourceRange()); + + FirstType = static_cast<Expr*>(first)->getType(); + } if (!Context.isObjCObjectPointerType(FirstType)) Diag(ForLoc, diag::err_selector_element_type, - FirstType.getAsString(), First->getSourceRange()); + FirstType.getAsString(), First->getSourceRange()); } if (Second) { DefaultFunctionArrayConversion(Second); diff --git a/clang/test/SemaObjC/foreach-1.m b/clang/test/SemaObjC/foreach-1.m new file mode 100644 index 00000000000..17c0379b253 --- /dev/null +++ b/clang/test/SemaObjC/foreach-1.m @@ -0,0 +1,10 @@ +// RUN: clang -fsyntax-only -verify %s + +@class NSArray; + +void f(NSArray *a) +{ + for (int i in a); // expected-error{{selector element type ('int') is not a valid object}} + for ((id)2 in a); // expected-error{{selector element is not a valid lvalue}} + for (2 in a); // expected-error{{selector element is not a valid lvalue}} +}
\ No newline at end of file |
