[cfe-commits] r68872 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td 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
Chris Lattner
sabre at nondot.org
Sat Apr 11 12:08:57 PDT 2009
Author: lattner
Date: Sat Apr 11 14:08:56 2009
New Revision: 68872
URL: http://llvm.org/viewvc/llvm-project?rev=68872&view=rev
Log:
Improve the 'cannot pass objc interface by value' diagnostic:
1) improve localizability by not passing english strings in.
2) improve location for arguments.
3) print the objc type being passed.
Before:
method-bad-param.m:15:1: error: Objective-C type cannot be passed by value
-(void) my_method:(foo) my_param
^
after:
method-bad-param.m:15:25: error: Objective-C interface type 'foo' cannot be passed by value
-(void) my_method:(foo) my_param
^
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
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.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=68872&r1=68871&r2=68872&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Sat Apr 11 14:08:56 2009
@@ -107,8 +107,8 @@
def ext_typedef_without_a_name : ExtWarn<"typedef requires a name">;
def err_statically_allocated_object : Error<
"Objective-C type cannot be statically allocated">;
-def err_object_cannot_be_by_value : Error<
- "Objective-C type cannot be %0 by value">;
+def err_object_cannot_be_passed_returned_by_value : Error<
+ "Objective-C interface type %1 cannot be %select{returned|passed}0 by value">;
def warn_enum_value_overflow : Warning<"overflow in enumeration value">;
def warn_pragma_pack_invalid_alignment : Warning<
"expected #pragma pack parameter to be '1', '2', '4', '8', or '16'">;
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=68872&r1=68871&r2=68872&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Sat Apr 11 14:08:56 2009
@@ -2705,8 +2705,8 @@
// Parameter declarators cannot be interface types. All ObjC objects are
// passed by reference.
if (T->isObjCInterfaceType()) {
- Diag(D.getIdentifierLoc(), diag::err_object_cannot_be_by_value)
- << "passed";
+ Diag(D.getIdentifierLoc(),
+ diag::err_object_cannot_be_passed_returned_by_value) << 1 << T;
New->setInvalidDecl();
}
Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=68872&r1=68871&r2=68872&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Sat Apr 11 14:08:56 2009
@@ -1415,8 +1415,8 @@
// 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";
+ Diag(MethodLoc, diag::err_object_cannot_be_passed_returned_by_value)
+ << 0 << resultDeclType;
return DeclPtrTy();
}
} else // get the type for "id".
@@ -1435,38 +1435,37 @@
for (unsigned i = 0; i < Sel.getNumArgs(); i++) {
// FIXME: arg->AttrList must be stored too!
- QualType argType, originalArgType;
+ QualType ArgType, UnpromotedArgType;
if (ArgInfo[i].Type == 0) {
- argType = Context.getObjCIdType();
+ UnpromotedArgType = ArgType = Context.getObjCIdType();
} else {
- argType = QualType::getFromOpaquePtr(ArgInfo[i].Type);
+ UnpromotedArgType = ArgType = QualType::getFromOpaquePtr(ArgInfo[i].Type);
// Perform the default array/function conversions (C99 6.7.5.3p[7,8]).
- if (argType->isArrayType()) { // (char *[]) -> (char **)
- originalArgType = argType;
- argType = Context.getArrayDecayedType(argType);
- } else if (argType->isFunctionType())
- argType = Context.getPointerType(argType);
- else if (argType->isObjCInterfaceType()) {
- // FIXME: improve message to include type!
- Diag(MethodLoc, diag::err_object_cannot_be_by_value)
- << "passed";
+ if (ArgType->isArrayType()) { // (char *[]) -> (char **)
+ ArgType = Context.getArrayDecayedType(ArgType);
+ } else if (ArgType->isFunctionType())
+ ArgType = Context.getPointerType(ArgType);
+ else if (ArgType->isObjCInterfaceType()) {
+ Diag(ArgInfo[i].NameLoc,
+ diag::err_object_cannot_be_passed_returned_by_value)
+ << 1 << ArgType;
ObjCMethod->setInvalidDecl();
return DeclPtrTy();
}
}
ParmVarDecl* Param;
- if (originalArgType.isNull())
+ if (ArgType == UnpromotedArgType)
Param = ParmVarDecl::Create(Context, ObjCMethod,
SourceLocation(/*FIXME*/),
- ArgInfo[i].Name, argType,
+ ArgInfo[i].Name, ArgType,
VarDecl::None, 0);
else
Param = OriginalParmVarDecl::Create(Context, ObjCMethod,
SourceLocation(/*FIXME*/),
- ArgInfo[i].Name, argType,
- originalArgType,
+ ArgInfo[i].Name, ArgType,
+ UnpromotedArgType,
VarDecl::None, 0);
Param->setObjCDeclQualifier(
Modified: cfe/trunk/test/Parser/objc-init.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/objc-init.m?rev=68872&r1=68871&r2=68872&view=diff
==============================================================================
--- cfe/trunk/test/Parser/objc-init.m (original)
+++ cfe/trunk/test/Parser/objc-init.m Sat Apr 11 14:08:56 2009
@@ -14,7 +14,7 @@
id objects[] = {[NSNumber METH]};
}
-void test2(NSNumber x) { // expected-error {{Objective-C type cannot be passed by value}}
+void test2(NSNumber x) { // expected-error {{Objective-C interface type 'NSNumber' cannot be passed by value}}
id objects[] = {[x METH]};
}
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=68872&r1=68871&r2=68872&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m (original)
+++ cfe/trunk/test/SemaObjC/invalid-objc-decls-1.m Sat Apr 11 14:08:56 2009
@@ -27,7 +27,7 @@
}
@end
-Super foo(Super parm1) { // expected-error{{Objective-C type cannot be passed by value}}
+Super foo(Super parm1) { // expected-error{{Objective-C interface type 'Super' 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=68872&r1=68871&r2=68872&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/method-bad-param.m (original)
+++ cfe/trunk/test/SemaObjC/method-bad-param.m Sat Apr 11 14:08:56 2009
@@ -7,16 +7,17 @@
@end
@interface bar
--(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}}
+-(void) my_method:(foo) my_param; // expected-error {{Objective-C interface type 'foo' cannot be passed by value}}
+- (foo)cccccc:(long)ddddd; // expected-error {{Objective-C interface type 'foo' cannot be returned by value}}
@end
@implementation bar
--(void) my_method:(foo) my_param // expected-error {{Objective-C type cannot be passed by value}}
+-(void) my_method:(foo) my_param // expected-error {{Objective-C interface type 'foo' cannot be passed by value}}
{
}
-- (foo)cccccc:(long)ddddd // expected-error {{Objective-C type cannot be returned by value}}
+- (foo)cccccc:(long)ddddd // expected-error {{Objective-C interface type 'foo' cannot be returned by value}}
{
}
@end
+void somefunc(foo x) {} // expected-error {{Objective-C interface type 'foo' cannot be passed by value}}
More information about the cfe-commits
mailing list