[cfe-commits] r65198 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.def lib/Sema/SemaDecl.cpp lib/Sema/SemaDeclObjC.cpp test/Parser/objc-init.m test/SemaObjC/invalid-objc-decls-1.m test/SemaObjC/method-bad-param.m
Steve Naroff
snaroff at apple.com
Fri Feb 20 14:59:17 PST 2009
Author: snaroff
Date: Fri Feb 20 16:59:16 2009
New Revision: 65198
URL: http://llvm.org/viewvc/llvm-project?rev=65198&view=rev
Log:
Fix <rdar://problem/6500554> missing objc error message.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
cfe/trunk/lib/Sema/SemaDecl.cpp
cfe/trunk/lib/Sema/SemaDeclObjC.cpp
cfe/trunk/test/Parser/objc-init.m
cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m
cfe/trunk/test/SemaObjC/method-bad-param.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def?rev=65198&r1=65197&r2=65198&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def Fri Feb 20 16:59:16 2009
@@ -103,7 +103,9 @@
DIAG(ext_typedef_without_a_name, EXTWARN,
"typedef requires a name")
DIAG(err_statically_allocated_object, ERROR,
- "statically allocated Objective-C object %0")
+ "Objective-C type cannot be statically allocated")
+DIAG(err_object_cannot_be_by_value, ERROR,
+ "Objective-C type cannot be %0 by value")
DIAG(warn_enum_value_overflow, WARNING,
"overflow in enumeration value")
DIAG(warn_pragma_pack_invalid_alignment, WARNING,
@@ -174,8 +176,6 @@
"duplicate declaration of method %0")
DIAG(error_missing_method_context, ERROR,
"missing context for method declaration")
-DIAG(err_object_as_method_param, ERROR,
- "can not use an object as parameter to a method")
DIAG(err_objc_property_attr_mutually_exclusive, ERROR,
"property attributes '%0' and '%1' are mutually exclusive")
DIAG(err_objc_property_requires_object, ERROR,
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=65198&r1=65197&r2=65198&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Fri Feb 20 16:59:16 2009
@@ -1470,8 +1470,7 @@
CheckExtraCXXDefaultArguments(D);
if (R.getTypePtr()->isObjCInterfaceType()) {
- Diag(D.getIdentifierLoc(), diag::err_statically_allocated_object)
- << D.getIdentifier();
+ Diag(D.getIdentifierLoc(), diag::err_statically_allocated_object);
InvalidDecl = true;
}
@@ -2761,6 +2760,13 @@
<< D.getCXXScopeSpec().getRange();
New->setInvalidDecl();
}
+ // Parameter declarators cannot be interface types. All ObjC objects are
+ // passed by reference.
+ if (parmDeclType->isObjCInterfaceType()) {
+ Diag(D.getIdentifierLoc(), diag::err_object_cannot_be_by_value)
+ << "passed";
+ New->setInvalidDecl();
+ }
// Add the parameter declaration into this scope.
S->AddDecl(New);
@@ -3671,8 +3677,7 @@
}
/// A field cannot be an Objective-c object
if (FDTy->isObjCInterfaceType()) {
- Diag(FD->getLocation(), diag::err_statically_allocated_object)
- << FD->getDeclName();
+ Diag(FD->getLocation(), diag::err_statically_allocated_object);
FD->setInvalidDecl();
EnclosingDecl->setInvalidDecl();
continue;
Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=65198&r1=65197&r2=65198&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Fri Feb 20 16:59:16 2009
@@ -1344,9 +1344,17 @@
}
QualType resultDeclType;
- if (ReturnType)
+ if (ReturnType) {
resultDeclType = QualType::getFromOpaquePtr(ReturnType);
- else // get the type for "id".
+
+ // Methods cannot return interface types. All ObjC objects are
+ // passed by reference.
+ if (resultDeclType->isObjCInterfaceType()) {
+ Diag(MethodLoc, diag::err_object_cannot_be_by_value)
+ << "returned";
+ return 0;
+ }
+ } else // get the type for "id".
resultDeclType = Context.getObjCIdType();
ObjCMethodDecl* ObjCMethod =
@@ -1375,7 +1383,9 @@
argType = Context.getPointerType(argType);
else if (argType->isObjCInterfaceType()) {
// FIXME! provide more precise location for the parameter
- Diag(MethodLoc, diag::err_object_as_method_param);
+ Diag(MethodLoc, diag::err_object_cannot_be_by_value)
+ << "passed";
+ ObjCMethod->setInvalidDecl();
return 0;
}
} else
Modified: cfe/trunk/test/Parser/objc-init.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/objc-init.m?rev=65198&r1=65197&r2=65198&view=diff
==============================================================================
--- cfe/trunk/test/Parser/objc-init.m (original)
+++ cfe/trunk/test/Parser/objc-init.m Fri Feb 20 16:59:16 2009
@@ -14,8 +14,8 @@
id objects[] = {[NSNumber METH]};
}
-void test2(NSNumber x) {
- id objects[] = {[x METH]}; // expected-error {{bad receiver type}}
+void test2(NSNumber x) { // expected-error {{Objective-C type cannot be passed by value}}
+ id objects[] = {[x METH]};
}
void test3(NSNumber *x) {
Modified: cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m?rev=65198&r1=65197&r2=65198&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m (original)
+++ cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m Fri Feb 20 16:59:16 2009
@@ -1,29 +1,33 @@
// RUN: clang -fsyntax-only -verify %s
@interface Super @end
-Super s1; // expected-error{{statically allocated Objective-C object 's1'}}
+Super s1; // expected-error{{Objective-C type cannot be statically allocated}}
-extern Super e1; // expected-error{{statically allocated Objective-C object 'e1'}}
+extern Super e1; // expected-error{{Objective-C type cannot be statically allocated}}
struct S {
- Super s1; // expected-error{{statically allocated Objective-C object 's1'}}
+ Super s1; // expected-error{{Objective-C type cannot be statically allocated}}
};
@protocol P1 @end
@interface INTF
{
- Super ivar1; // expected-error{{statically allocated Objective-C object 'ivar1'}}
+ Super ivar1; // expected-error{{Objective-C type cannot be statically allocated}}
}
@end
+struct whatever {
+ Super objField; // expected-error{{Objective-C type cannot be statically allocated}}
+};
+
@interface MyIntf
{
- Super<P1> ivar1; // expected-error{{statically allocated Objective-C object 'ivar1'}}
+ Super<P1> ivar1; // expected-error{{Objective-C type cannot be statically allocated}}
}
@end
-Super foo(Super parm1) {
- Super p1; // expected-error{{statically allocated Objective-C object 'p1'}}
+Super foo(Super parm1) { // expected-error{{Objective-C type cannot be passed by value}}
+ Super p1; // expected-error{{Objective-C type cannot be statically allocated}}
return p1;
}
Modified: cfe/trunk/test/SemaObjC/method-bad-param.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/method-bad-param.m?rev=65198&r1=65197&r2=65198&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/method-bad-param.m (original)
+++ cfe/trunk/test/SemaObjC/method-bad-param.m Fri Feb 20 16:59:16 2009
@@ -7,11 +7,15 @@
@end
@interface bar
--(void) my_method:(foo) my_param; // expected-error {{can not use an object as parameter to a method}}
+-(void) my_method:(foo) my_param; // expected-error {{Objective-C type cannot be passed by value}}
+- (foo)cccccc:(long)ddddd; // expected-error {{Objective-C type cannot be returned by value}}
@end
@implementation bar
--(void) my_method:(foo) my_param // expected-error {{can not use an object as parameter to a method}}
+-(void) my_method:(foo) my_param // expected-error {{Objective-C type cannot be passed by value}}
+{
+}
+- (foo)cccccc:(long)ddddd // expected-error {{Objective-C type cannot be returned by value}}
{
}
@end
More information about the cfe-commits
mailing list