Patch to add semantics check for ObjC2's foreacn statement.
llvm-svn: 45561
diff --git a/clang/Sema/Sema.cpp b/clang/Sema/Sema.cpp
index bca3ec5..8f340db 100644
--- a/clang/Sema/Sema.cpp
+++ b/clang/Sema/Sema.cpp
@@ -26,6 +26,20 @@
strcmp(typeName, "SEL") == 0 || strcmp(typeName, "Protocol") == 0;
}
+bool Sema::isObjcObjectPointerType(QualType type) const {
+ if (!type->isPointerType() && !type->isObjcQualifiedIdType())
+ return false;
+ if (type == Context.getObjcIdType() || type == Context.getObjcClassType() ||
+ type->isObjcQualifiedIdType())
+ return true;
+
+ while (type->isPointerType()) {
+ PointerType *pointerType = static_cast<PointerType*>(type.getTypePtr());
+ type = pointerType->getPointeeType();
+ }
+ return (type->isObjcInterfaceType() || type->isObjcQualifiedIdType());
+}
+
void Sema::ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) {
TUScope = S;
if (PP.getLangOptions().ObjC1) {
diff --git a/clang/Sema/Sema.h b/clang/Sema/Sema.h
index 8846d15..6f54651 100644
--- a/clang/Sema/Sema.h
+++ b/clang/Sema/Sema.h
@@ -285,6 +285,10 @@
/// isBuiltinObjcType - Returns true of the type is "id", "SEL", "Class"
/// or "Protocol".
bool isBuiltinObjcType(TypedefDecl *TD);
+
+ /// isObjcObjectPointerType - Returns tru if type is an objective-c pointer
+ /// to an object type; such as "id", "Class", Intf*, id<P>, etc.
+ bool isObjcObjectPointerType(QualType type) const;
/// AddInstanceMethodToGlobalPool - All instance methods in a translation
/// unit are added to a global pool. This allows us to efficiently associate
diff --git a/clang/Sema/SemaExpr.cpp b/clang/Sema/SemaExpr.cpp
index de642c6..3a3cfc1 100644
--- a/clang/Sema/SemaExpr.cpp
+++ b/clang/Sema/SemaExpr.cpp
@@ -2350,8 +2350,7 @@
return true;
}
} else {
- bool receiverIsQualId =
- dyn_cast<ObjcQualifiedIdType>(RExpr->getType()) != 0;
+ bool receiverIsQualId = dyn_cast<ObjcQualifiedIdType>(receiverType) != 0;
// FIXME (snaroff): checking in this code from Patrick. Needs to be
// revisited. how do we get the ClassDecl from the receiver expression?
if (!receiverIsQualId)
diff --git a/clang/Sema/SemaStmt.cpp b/clang/Sema/SemaStmt.cpp
index 2c2dc5e..6b60bd0 100644
--- a/clang/Sema/SemaStmt.cpp
+++ b/clang/Sema/SemaStmt.cpp
@@ -538,8 +538,9 @@
Stmt *First = static_cast<Stmt*>(first);
Expr *Second = static_cast<Expr*>(second);
Stmt *Body = static_cast<Stmt*>(body);
-
+ QualType FirstType;
if (DeclStmt *DS = dyn_cast_or_null<DeclStmt>(First)) {
+ FirstType = dyn_cast<ValueDecl>(DS->getDecl())->getType();
// C99 6.8.5p3: The declaration part of a 'for' statement shall only declare
// identifiers for objects having storage class 'auto' or 'register'.
for (ScopedDecl *D = DS->getDecl(); D; D = D->getNextDeclarator()) {
@@ -547,19 +548,21 @@
if (BVD && !BVD->hasLocalStorage())
BVD = 0;
if (BVD == 0)
- Diag(dyn_cast<ScopedDecl>(D)->getLocation(),
- diag::err_non_variable_decl_in_for);
- // FIXME: mark decl erroneous!
+ return Diag(dyn_cast<ScopedDecl>(D)->getLocation(),
+ diag::err_non_variable_decl_in_for);
}
}
+ else
+ FirstType = static_cast<Expr*>(first)->getType();
+ if (!isObjcObjectPointerType(FirstType))
+ Diag(ForColLoc, diag::err_selector_element_type,
+ FirstType.getAsString(), First->getSourceRange());
if (Second) {
DefaultFunctionArrayConversion(Second);
QualType SecondType = Second->getType();
-#if 0
- if (!SecondType->isScalarType()) // C99 6.8.5p2
- return Diag(ForColLoc, diag::err_typecheck_statement_requires_scalar,
- SecondType.getAsString(), Second->getSourceRange());
-#endif
+ if (!isObjcObjectPointerType(SecondType))
+ Diag(ForColLoc, diag::err_collection_expr_type,
+ SecondType.getAsString(), Second->getSourceRange());
}
return new ObjcForCollectionStmt(First, Second, Body, ForColLoc);
}